Index: java/main/src/test/java/com/framsticks/gui/BrowserTest.java
===================================================================
--- java/main/src/test/java/com/framsticks/gui/BrowserTest.java	(revision 88)
+++ java/main/src/test/java/com/framsticks/gui/BrowserTest.java	(revision 90)
@@ -1,75 +1,37 @@
 package com.framsticks.gui;
 
-import javax.swing.JFrame;
+import static org.fest.assertions.Assertions.assertThat;
+import static org.fest.swing.edt.GuiActionRunner.execute;
+
 
 import org.apache.log4j.Logger;
-import org.fest.swing.edt.FailOnThreadViolationRepaintManager;
-import org.fest.swing.edt.GuiActionRunner;
-import org.fest.swing.edt.GuiQuery;
 import org.fest.swing.edt.GuiTask;
-import org.fest.swing.fixture.FrameFixture;
-import org.fest.swing.fixture.JTreeFixture;
-// import static org.fest.swing.edt.GuiActionRunner.*;
-import org.testng.annotations.*;
+import org.testng.annotations.Test;
 
+import com.framsticks.model.ModelPackage;
 import com.framsticks.remote.RemoteInstance;
-import com.framsticks.test.TestConfiguration;
-import com.framsticks.util.dispatching.Dispatching;
-import com.framsticks.util.dispatching.JoinableMonitor;
-// import com.framsticks.util.dispatching.Dispatching;
 
-import static org.fest.assertions.Assertions.*;
-import static org.fest.swing.core.BasicRobot.robotWithNewAwtHierarchy;
-import static org.fest.swing.edt.GuiActionRunner.*;
-import org.fest.swing.core.Robot;
+public class BrowserTest extends BrowserBaseTest {
 
-public class BrowserTest extends TestConfiguration {
 	private static final Logger log = Logger.getLogger(BrowserTest.class);
 
-	JoinableMonitor monitor;
-	Browser browser;
-	Robot robot;
-	FrameFixture frame;
+	RemoteInstance localhost;
 
-	@BeforeClass
-	public void setUp() {
-		FailOnThreadViolationRepaintManager.install();
-		assertThat(executeInEDT()).isTrue();
+	@Override
+	protected void configureBrowser() {
+		browser = new Browser();
 
-		robot = robotWithNewAwtHierarchy();
-
-		browser = new Browser();
-		monitor = new JoinableMonitor(browser);
-
-		RemoteInstance localhost = new RemoteInstance();
+		localhost = new RemoteInstance();
 		localhost.setName("localhost");
 		localhost.setAddress("localhost:9009");
+		localhost.usePackage(new ModelPackage());
 
 		browser.addInstance(localhost);
 
-		monitor.use();
-		// robot.waitForIdle();
-		frame = new FrameFixture(robot,
-				GuiActionRunner.execute(new GuiQuery<JFrame>() {
-					@Override
-					protected JFrame executeInEDT() throws Throwable {
-						return browser.getMainFrame().getSwing();
-					}
-				}));
-
-		log.info("frame fixture done");
-		// frame.show();
-		// log.info("frame fixture shown");
 	}
 
-	public void clickAndExpandPath(JTreeFixture tree, String path) {
-		tree.clickPath(path).expandPath(path);
-		robot.waitForIdle();
-	}
-
-	@Test
+	@Test(timeOut = 10000)
 	public void testShow() {
 		log.info("testing");
-		JTreeFixture tree = frame.tree("tree");
 		tree.clickRow(0).expandRow(0);
 		robot.waitForIdle();
@@ -81,54 +43,14 @@
 			@Override
 			protected void executeInEDT() throws Throwable {
-				assertThat(frame.panel("o Simulator").component().isVisible())
-						.isTrue();
+				assertThat(frame.panel("Simulator").component().isVisible()).isTrue();
 			}
 		});
 
-		clickAndExpandPath(tree, "localhost/simulator/genepools");
-		clickAndExpandPath(tree, "localhost/simulator/genepools/groups");
-		clickAndExpandPath(tree, "localhost/simulator/genepools/groups/Genotypes");
+		clickAndExpandPath("localhost/simulator/genepools");
+		clickAndExpandPath("localhost/simulator/genepools/groups");
+		clickAndExpandPath("localhost/simulator/genepools/groups/Genotypes");
+	}
 
 
 
-
-
-
-		// tree.clickPath("localhost/simulator/genepools/groups/Genotypes/genotypes");
-		// robot.waitForIdle();
-		// sleep(2);
-		// tree.expandPath("localhost/simulator/genepools/groups/Genotypes/genotypes");
-
-		// tree.expandRow(tree.component().getLeadSelectionRow() + 1);
-		// robot.waitForIdle();
-
-		// sleep(2);
-	}
-
-
-	@AfterClass
-	public void tearDown() {
-		log.info("before close");
-
-		monitor.drop();
-
-		Dispatching.joinAbsolutely(browser);
-		// frame.cleanUp();
-		// log.info("before close");
-		// browser.interrupt();
-
-		// try {
-		// 	// frame.close();
-		// } catch (Throwable t) {
-		// 	log.error("caught ", t);
-		// }
-		// log.info("after close");
-		// // frame.close();
-		// // frame.cleanUp();
-
-
-
-		// Dispatching.join(browser);
-	}
-
 }
