diff --git a/src/test/java/org/janelia/saalfeldlab/paintera/PainteraBaseViewTest.java b/src/test/java/org/janelia/saalfeldlab/paintera/PainteraBaseViewTest.java
index ceb4bbfc7..66f675348 100644
--- a/src/test/java/org/janelia/saalfeldlab/paintera/PainteraBaseViewTest.java
+++ b/src/test/java/org/janelia/saalfeldlab/paintera/PainteraBaseViewTest.java
@@ -19,26 +19,25 @@
 import net.imglib2.view.IntervalView;
 import net.imglib2.view.Views;
 import org.janelia.saalfeldlab.fx.util.InvokeOnJavaFXApplicationThread;
-import org.janelia.saalfeldlab.paintera.meshes.MeshSettings;
 import org.janelia.saalfeldlab.util.grids.LabelBlockLookupAllBlocks;
 import org.janelia.saalfeldlab.util.grids.LabelBlockLookupNoBlocks;
 import org.jetbrains.annotations.NotNull;
-import org.junit.*;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
 import org.testfx.api.FxRobot;
-import org.testfx.api.FxToolkit;
 import org.testfx.framework.junit.ApplicationTest;
 
 import java.util.Arrays;
 import java.util.Random;
-import java.util.concurrent.TimeoutException;
-import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
+
 public class PainteraBaseViewTest extends FxRobot {
 
-	@BeforeClass
+//	@BeforeClass
 	public static void setup() throws Exception {
 
 		System.setProperty("headless.geometry", "1600x1200-32");
@@ -48,17 +47,15 @@ public static void setup() throws Exception {
 		ApplicationTest.launch(Paintera.class, "--log-level=ERROR");
 	}
 
-	@AfterClass
-	public static void cleanup() throws InterruptedException, TimeoutException {
+//	@AfterClass
+	public static void cleanup() throws InterruptedException {
 		InvokeOnJavaFXApplicationThread.invokeAndWait(() -> {
-			Paintera.getPaintera().getBaseView().stop();
-			Paintera.getPaintera().getProjectDirectory().close();
+			Paintera.getApplication().resetApplication();
 		});
-		FxToolkit.cleanupApplication(Paintera.getApplication());
 	}
 
-	@Test
-	public void testAddSingleScaleLabelSource() throws Exception {
+//	@Test
+	public void testAddSingleScaleLabelSource() {
 		final RandomAccessibleInterval<UnsignedLongType> labels = ArrayImgs.unsignedLongs(10, 15, 20);
 		final PainteraBaseView viewer = Paintera.getPaintera().getBaseView();
 		viewer.addConnectomicsLabelSource(
@@ -69,7 +66,7 @@ public void testAddSingleScaleLabelSource() throws Exception {
 				"singleScaleLabelSource", new LabelBlockLookupNoBlocks());
 	}
 
-	@Test
+//	@Test
 	public void testAddSingleScaleConnectomicsRawSource() {
 		final Random random = new Random();
 		final RandomAccessibleInterval<UnsignedLongType> rawData =
@@ -90,8 +87,8 @@ public void testAddSingleScaleConnectomicsRawSource() {
 		);
 	}
 
-	@Test
-	public void testAddMultiScaleConnectomicsRawSource() throws Exception {
+//	@Test
+	public void testAddMultiScaleConnectomicsRawSource() {
 		var random = new Random();
 		final double[] center2D = new double[]{500, 500};
 		final var multiscale = generateMultiscaleLabels(
@@ -135,8 +132,8 @@ private static void fillCylinderChunk(double[] center2D, Double scale, LoopBuild
 		});
 	}
 
-	@Test
-	public void testAddMultiScaleConnectomicsLabelSource() throws Exception {
+//	@Test
+	public void testAddMultiScaleConnectomicsLabelSource() {
 		final Random random = new Random();
 
 		final var multiscale = generateMultiscaleLabels(4,
@@ -271,8 +268,9 @@ public GeneratedMultiscaleImage(RandomAccessibleInterval<T>[] images, double[][]
 		}
 	}
 
-	@NotNull private static GeneratedMultiscaleImage<UnsignedLongType> generateMultiscaleLabels(int numScales, FinalInterval interval, int[] blockSize,
-			double[] center, BiFunction<Double, LoopBuilder.Chunk<Consumer<RandomAccess<UnsignedLongType>>>, ?> fillLabelByChunk) {
+	@NotNull
+	private static GeneratedMultiscaleImage<UnsignedLongType> generateMultiscaleLabels(int numScales, FinalInterval interval, int[] blockSize,
+	                                                                                   double[] center, BiFunction<Double, LoopBuilder.Chunk<Consumer<RandomAccess<UnsignedLongType>>>, ?> fillLabelByChunk) {
 
 		final CachedCellImg<UnsignedLongType, ?>[] multiScaleImages = new CachedCellImg[numScales];
 		for (int i = 0; i < multiScaleImages.length; i++) {