Index: references/src/test/java/geniusweb/references/ParametersTest.java
===================================================================
--- references/src/test/java/geniusweb/references/ParametersTest.java	(revision 52)
+++ 	(revision )
@@ -1,103 +1,0 @@
-package geniusweb.references;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Test;
-
-import tudelft.utilities.junit.GeneralTests;
-
-public class ParametersTest extends GeneralTests<Parameters> {
-
-	private final Parameters params1 = new Parameters();
-	private final Parameters params1a = new Parameters();
-	private final Parameters params2 = new Parameters().with("a", 1).with("b",
-			2d);
-
-	@Override
-	public List<List<Parameters>> getGeneralTestData() {
-		return Arrays.asList(Arrays.asList(params1, params1a),
-				Arrays.asList(params2));
-	}
-
-	@Override
-	public List<String> getGeneralTestStrings() {
-		return Arrays.asList("\\{\\}", "\\{a=1, b=2.0\\}");
-	}
-
-	@Test(expected = IllegalArgumentException.class)
-	public void getWrongClass() {
-		params2.get("a", String.class);
-	}
-
-	@Test
-	public void getInteger() {
-		assertEquals((Integer) 1, params2.get("a", Integer.class));
-		assertEquals((Double) 2d, params2.get("b", Double.class));
-	}
-
-	@Test
-	public void getDouble() {
-		assertEquals((Double) 2d, params2.getDouble("b", 7d, null, null));
-		assertEquals((Double) 2d, params2.getDouble("b", 7d, 0d, 4d));
-
-		// test outside range
-		assertEquals((Double) 7d, params2.getDouble("b", 7d, 4d, 6d));
-		assertEquals((Double) 7d, params2.getDouble("b", 7d, -2d, 1d));
-
-		// test fallback null
-		assertEquals(null, params2.getDouble("b", null, 4d, 6d));
-
-		// a is integer!
-		assertEquals((Double) 1d, params2.getDouble("a", 0d, -0d, 2d));
-
-	}
-
-	@Test
-	public void getDoubleWithErrors() {
-		// a does not contain a double
-		assertEquals((Double) 7d, params2.getDouble("a", 7d, 4d, 6d));
-		// c does not exist
-		assertEquals((Double) 7d, params2.getDouble("c", 7d, 4d, 6d));
-
-		// a=1, which is outside [min, max]. Therefore default value should be
-		// returned.
-		assertEquals(null, params2.getDouble("a", null, 2d, 3d));
-
-	}
-
-	@Test
-	public void withTest() {
-		Parameters p = params2.with("a", 2);
-		assertEquals(1, params2.get("a"));
-		assertEquals(2d, params2.get("b"));
-		assertEquals(2, p.get("a"));
-		assertEquals(2d, p.get("b"));
-	}
-
-	@Test
-	public void withParamsTest() {
-		Parameters upd = new Parameters().with("a", 2);
-		Parameters p = params2.with(upd);
-		assertEquals(1, params2.get("a"));
-		assertEquals(2d, params2.get("b"));
-		assertEquals(2, p.get("a"));
-		assertEquals(2d, p.get("b"));
-	}
-
-	@Test
-	public void isEmptyTest() {
-		assertTrue(params1.isEmpty());
-		assertFalse(params2.isEmpty());
-	}
-
-	@Test
-	public void containsKeyTest() {
-		assertTrue(params2.containsKey("a"));
-		assertFalse(params2.containsKey("c"));
-	}
-}
Index: references/src/test/java/geniusweb/references/PartiWithParamsTest.java
===================================================================
--- references/src/test/java/geniusweb/references/PartiWithParamsTest.java	(revision 52)
+++ 	(revision )
@@ -1,72 +1,0 @@
-package geniusweb.references;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import tudelft.utilities.junit.GeneralTests;
-
-public class PartiWithParamsTest extends GeneralTests<PartyWithParameters> {
-
-	private PartyRef party1, party2;
-	private Parameters param1, param2;
-	private PartyWithParameters party1param1, party1param1a;
-	private PartyWithParameters party1param2;
-	private final String serialized = "{\"partyref\":\"ws:party1\",\"parameters\":{\"a\":1}}";
-
-	@Before
-	public void before() throws URISyntaxException {
-		party1 = new PartyRef(new URI("ws:party1"));
-		party2 = new PartyRef(new URI("ws:party2"));
-		param1 = new Parameters();
-		param2 = new Parameters().with("a", 1);
-		party1param1 = new PartyWithParameters(party1, param1);
-		party1param1a = new PartyWithParameters(party1, param1);
-		party1param2 = new PartyWithParameters(party1, param2);
-	}
-
-	@Override
-	public List<List<PartyWithParameters>> getGeneralTestData() {
-		return Arrays.asList(
-				Arrays.asList(party1param1, party1param1a, party1param1a),
-				Arrays.asList(party1param2));
-	}
-
-	@Override
-	public List<String> getGeneralTestStrings() {
-		return Arrays.asList("PartyRef.ws:party1.",
-				"PartyRef.ws:party1.\\{a=1\\}");
-	}
-
-	@Test
-	public void testSerialize() throws JsonProcessingException {
-		ObjectMapper jackson = new ObjectMapper();
-
-		String json = jackson.writeValueAsString(party1param2);
-		System.out.println(json);
-		assertEquals(serialized, json);
-	}
-
-	@Test
-	public void testDeserialize()
-			throws JsonParseException, JsonMappingException, IOException {
-		ObjectMapper jackson = new ObjectMapper();
-		PartyWithParameters p = jackson.readValue(serialized,
-				PartyWithParameters.class);
-		System.out.println(p);
-		assertEquals(party1param2, p);
-	}
-
-}
Index: references/src/test/java/geniusweb/references/PartyWithProfileTest.java
===================================================================
--- references/src/test/java/geniusweb/references/PartyWithProfileTest.java	(revision 52)
+++ references/src/test/java/geniusweb/references/PartyWithProfileTest.java	(revision 1)
@@ -17,4 +17,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import geniusweb.references.PartyRef;
+import geniusweb.references.PartyWithProfile;
+import geniusweb.references.ProfileRef;
 import tudelft.utilities.junit.GeneralTests;
 
@@ -23,7 +26,6 @@
 	private PartyRef party1, party1a, party2, party3;
 	private ProfileRef profile1, profile2;
-	private PartyWithProfile partyprof1, partyprof1a, partyprof2, partyprof3,
-			partyprof4;
-	private final String serialized = "{\"party\":{\"partyref\":\"ws:party1\",\"parameters\":{}},\"profile\":\"ws:profile1\"}";
+	private PartyWithProfile partyprof1, partyprof1a, partyprof2, partyprof3;
+	private final String serialized = "{\"party\":\"ws:party1\",\"profile\":\"ws:profile1\"}";
 
 	@Before
@@ -37,19 +39,8 @@
 		profile2 = new ProfileRef(new URI("ws:profile2"));
 
-		Parameters settings1 = new Parameters();
-		Parameters settings2 = new Parameters().with("a", 1);
-
-		PartyWithParameters party1withparams1 = new PartyWithParameters(party1,
-				settings1);
-		PartyWithParameters party1withparams2 = new PartyWithParameters(party1,
-				settings2);
-		PartyWithParameters party2withparams1 = new PartyWithParameters(party2,
-				settings1);
-
-		partyprof1 = new PartyWithProfile(party1withparams1, profile1);
-		partyprof1a = new PartyWithProfile(party1withparams1, profile1);
-		partyprof2 = new PartyWithProfile(party2withparams1, profile1);
-		partyprof3 = new PartyWithProfile(party1withparams1, profile2);
-		partyprof4 = new PartyWithProfile(party1withparams2, profile1);
+		partyprof1 = new PartyWithProfile(party1, profile1);
+		partyprof1a = new PartyWithProfile(party1, profile1);
+		partyprof2 = new PartyWithProfile(party2, profile1);
+		partyprof3 = new PartyWithProfile(party1, profile2);
 
 	}
@@ -58,6 +49,5 @@
 	public List<List<PartyWithProfile>> getGeneralTestData() {
 		return Arrays.asList(Arrays.asList(partyprof1, partyprof1a),
-				Arrays.asList(partyprof2), Arrays.asList(partyprof3),
-				Arrays.asList(partyprof4));
+				Arrays.asList(partyprof2), Arrays.asList(partyprof3));
 	}
 
@@ -65,8 +55,7 @@
 	public List<String> getGeneralTestStrings() {
 		return Arrays.asList(
-				"PartyWithProfile.PartyRef.ws:party1.,ProfileRef.ws:profile1.*",
-				"PartyWithProfile.PartyRef.ws:party2.,ProfileRef.ws:profile1.*",
-				"PartyWithProfile.PartyRef.ws:party1.,ProfileRef.ws:profile2.*",
-				"PartyWithProfile.PartyRef.ws:party1.\\{a=1\\},ProfileRef.ws:profile1.*");
+				"PartyWithProfile.PartyRef.ws:party1.,ProfileRef.ws:profile1..",
+				"PartyWithProfile.PartyRef.ws:party2.,ProfileRef.ws:profile1..",
+				"PartyWithProfile.PartyRef.ws:party1.,ProfileRef.ws:profile2..");
 	}
 
@@ -77,5 +66,5 @@
 	@Test(expected = IllegalArgumentException.class)
 	public void nullTest() throws URISyntaxException {
-		new PartyWithProfile((PartyWithParameters) null, (ProfileRef) null);
+		new PartyWithProfile((PartyRef) null, (ProfileRef) null);
 	}
 
Index: references/src/test/java/geniusweb/references/ProtocolRefTest.java
===================================================================
--- references/src/test/java/geniusweb/references/ProtocolRefTest.java	(revision 52)
+++ references/src/test/java/geniusweb/references/ProtocolRefTest.java	(revision 1)
@@ -17,4 +17,5 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import geniusweb.references.ProtocolRef;
 import tudelft.utilities.junit.GeneralTests;
 
@@ -57,11 +58,4 @@
 
 	@Test
-	public void testSaop() {
-		ProtocolRef saop = new ProtocolRef("SAOP");
-		System.out.println(saop.getURI());
-		assertEquals("SAOP", saop.getURI().getPath());
-	}
-
-	@Test
 	public void testSerialize() throws JsonProcessingException {
 		ObjectMapper jackson = new ObjectMapper();
