Index: src/test/java/geniusweb/partiesserver/AvailablePartiesUpdaterTest.java
===================================================================
--- src/test/java/geniusweb/partiesserver/AvailablePartiesUpdaterTest.java	(revision 7)
+++ src/test/java/geniusweb/partiesserver/AvailablePartiesUpdaterTest.java	(revision 8)
@@ -31,4 +31,5 @@
 
 public class AvailablePartiesUpdaterTest {
+	private static final String RANDOMPARTY = "target/jars/randomparty-1.1.0.jar";
 	private static final int TESTRATE = 200; // check file changes every 200ms
 	@SuppressWarnings("unchecked")
@@ -146,6 +147,5 @@
 	public void randomPartyJarTest() throws IOException, InterruptedException {
 		init();
-		Files.copy(Paths.get("target/jars/randomparty-1.0.0.jar"),
-				tmpdir.resolve(RNDPARTY));
+		Files.copy(Paths.get(RANDOMPARTY), tmpdir.resolve(RNDPARTY));
 
 		Thread.sleep(2 * TESTRATE);
@@ -157,5 +157,5 @@
 	public void removeJarTest() throws IOException, InterruptedException {
 		init();
-		Files.copy(Paths.get("target/jars/randomparty-1.0.0.jar"), RNDPARTY);
+		Files.copy(Paths.get(RANDOMPARTY), RNDPARTY);
 		Thread.sleep(2 * TESTRATE);
 		assertEquals(1, repo.list().size());
@@ -169,5 +169,5 @@
 	public void removeRootTest() throws IOException, InterruptedException {
 		init();
-		Files.copy(Paths.get("target/jars/randomparty-1.0.0.jar"), RNDPARTY);
+		Files.copy(Paths.get(RANDOMPARTY), RNDPARTY);
 		Thread.sleep(2 * TESTRATE);
 		assertEquals(1, repo.list().size());
Index: src/test/java/geniusweb/partiesserver/JavaClientTest.java
===================================================================
--- src/test/java/geniusweb/partiesserver/JavaClientTest.java	(revision 7)
+++ src/test/java/geniusweb/partiesserver/JavaClientTest.java	(revision 8)
@@ -39,5 +39,6 @@
  */
 public class JavaClientTest {
-//	private static final String JSON = "{\"jobs\":[\"jobs1\"]}";
+	private static final String RANDOMPARTY = "http://localhost:8080/partiesserver/run/randomparty-1.1.0";
+	// private static final String JSON = "{\"jobs\":[\"jobs1\"]}";
 //	private static final String JOBS1PROFILE = "{\"LinearAdditiveUtilitySpace\":{\"issueUtilities\":{\"lease car\":{\"discreteutils\":{\"valueUtilities\":{\"no\":0,\"yes\":1}}},\"permanent contract\":{\"discreteutils\":{\"valueUtilities\":{\"no\":0,\"yes\":1}}},\"career development opportunities\":{\"discreteutils\":{\"valueUtilities\":{\"high\":1,\"low\":0,\"medium\":0.5}}},\"fte\":{\"discreteutils\":{\"valueUtilities\":{\"1.0\":0.75,\"0.6\":0.25,\"0.8\":0.5}}},\"salary\":{\"discreteutils\":{\"valueUtilities\":{\"4000\":1.0,\"2500\":0.25,\"3500\":0.75,\"2000\":0,\"3000\":0.3}}},\"work from home\":{\"discreteutils\":{\"valueUtilities\":{\"1\":0.5,\"2\":0.666666666666,\"0\":0.333333333}}}},\"issueWeights\":{\"lease car\":0.06,\"permanent contract\":0.16,\"career development opportunities\":0.04,\"fte\":0.32,\"salary\":0.24,\"work from home\":0.18},\"domain\":{\"name\":\"jobs\",\"issuesValues\":{\"lease car\":{\"values\":[\"yes\",\"no\"]},\"permanent contract\":{\"values\":[\"yes\",\"no\"]},\"career development opportunities\":{\"values\":[\"low\",\"medium\",\"high\"]},\"fte\":{\"values\":[\"0.6\",\"0.8\",\"1.0\"]},\"salary\":{\"values\":[\"2000\",\"2500\",\"3000\",\"3500\",\"4000\"]},\"work from home\":{\"values\":[\"0\",\"1\",\"2\"]}}},\"name\":\"jobs1\"}}";
 	private EmbeddedTomcat tomcat = new EmbeddedTomcat();
@@ -60,4 +61,5 @@
 	public void after() throws Throwable {
 		Thread.sleep(2000);
+		System.setSecurityManager(null);
 		tomcat.stop();
 	}
@@ -157,6 +159,5 @@
 	 */
 	private String startParty() throws IOException, InterruptedException {
-		URL url = new URL(
-				"http://localhost:8080/partiesserver/run/randomparty-1.0.0");
+		URL url = new URL(RANDOMPARTY);
 		HttpURLConnection conn = (HttpURLConnection) url.openConnection();
 		conn.setRequestMethod("GET");
Index: src/test/java/geniusweb/partiesserver/repository/RunningPartyTest.java
===================================================================
--- src/test/java/geniusweb/partiesserver/repository/RunningPartyTest.java	(revision 7)
+++ src/test/java/geniusweb/partiesserver/repository/RunningPartyTest.java	(revision 8)
@@ -16,9 +16,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import geniusweb.actions.Action;
 import geniusweb.actions.PartyId;
-import geniusweb.connection.DefaultConnection;
-import geniusweb.partiesserver.repository.AvailableParty;
-import geniusweb.partiesserver.repository.RunningParty;
+import geniusweb.partiesserver.websocket.PartySocket;
 import geniusweb.party.Capabilities;
 import geniusweb.party.DefaultParty;
@@ -90,6 +87,5 @@
 		RunningParty rparty = new RunningParty(party1, id1, "name1", now, end,
 				null);
-		DefaultConnection<Inform, Action> connection = mock(
-				DefaultConnection.class);
+		PartySocket connection = mock(PartySocket.class);
 		rparty = rparty.withConnection(connection);
 	}
@@ -99,6 +95,5 @@
 		RunningParty rparty = new RunningParty(party1, id1, "name1", now, end,
 				null);
-		DefaultConnection<Inform, Action> connection = mock(
-				DefaultConnection.class);
+		PartySocket connection = mock(PartySocket.class);
 		rparty = rparty.withConnection(connection);
 		rparty = rparty.withConnection(connection);
@@ -112,6 +107,5 @@
 		RunningParty rparty = new RunningParty(party1, id1, "name1", now, end,
 				null);
-		DefaultConnection<Inform, Action> connection = mock(
-				DefaultConnection.class);
+		PartySocket connection = mock(PartySocket.class);
 		rparty = rparty.withConnection(connection);
 
@@ -120,5 +114,5 @@
 
 		ArgumentCaptor<Inform> argument = ArgumentCaptor.forClass(Inform.class);
-		verify(connection, times(1)).notifyChange(argument.capture());
+		verify(connection, times(1)).notifyListeners(argument.capture());
 		assertEquals(info, argument.getValue());
 	}
Index: src/test/java/geniusweb/partiesserver/websocket/PartySocketTest.java
===================================================================
--- src/test/java/geniusweb/partiesserver/websocket/PartySocketTest.java	(revision 7)
+++ src/test/java/geniusweb/partiesserver/websocket/PartySocketTest.java	(revision 8)
@@ -23,8 +23,7 @@
 import geniusweb.actions.EndNegotiation;
 import geniusweb.actions.PartyId;
-import geniusweb.connection.Connection;
+import geniusweb.connection.ConnectionEnd;
 import geniusweb.partiesserver.repository.RunningPartiesRepo;
 import geniusweb.partiesserver.repository.RunningParty;
-import geniusweb.partiesserver.websocket.PartySocket;
 import geniusweb.party.Party;
 import geniusweb.party.inform.Inform;
@@ -83,5 +82,5 @@
 
 		@SuppressWarnings("unchecked")
-		Connection<Inform, Action> connection = mock(Connection.class);
+		ConnectionEnd<Inform, Action> connection = mock(ConnectionEnd.class);
 		/*
 		 * we must call runningparty directly on this one because
