Index: events/src/test/java/geniusweb/actions/FileLocationTest.java
===================================================================
--- events/src/test/java/geniusweb/actions/FileLocationTest.java	(revision 31)
+++ events/src/test/java/geniusweb/actions/FileLocationTest.java	(revision 31)
@@ -0,0 +1,66 @@
+package geniusweb.actions;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.UUID;
+
+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;
+
+public class FileLocationTest {
+	private final ObjectMapper jackson = new ObjectMapper();
+	private FileLocation fileloc = new FileLocation();
+	private String filelocstr = "\"" + fileloc.getUUIDString() + "\"";
+
+	private String uuidstr = "b871e65c-e7fe-4664-b607-cb31898cc3ac";
+	private FileLocation fileloc2 = new FileLocation(UUID.fromString(uuidstr));
+
+	@Test
+	public void isUsable() throws IOException {
+		File file = fileloc.getFile();
+		assertFalse(file.exists());
+		assertTrue(file.createNewFile());
+		assertTrue(file.canRead());
+		assertTrue(file.canWrite());
+
+	}
+
+	@Test
+	public void serializeTest() throws JsonProcessingException {
+		System.out.println(jackson.writeValueAsString(fileloc));
+		assertEquals(filelocstr, jackson.writeValueAsString(fileloc));
+	}
+
+	@Test
+	public void deserializTest() throws IOException {
+		FileLocation loc = jackson.readValue(filelocstr, FileLocation.class);
+		assertEquals(fileloc, loc);
+	}
+
+	@Test(expected = JsonParseException.class)
+	public void deserializeTestInjectinon()
+			throws JsonParseException, JsonMappingException, IOException {
+		jackson.readValue("bla/../..", FileLocation.class);
+	}
+
+	@Test(expected = JsonParseException.class)
+	public void deserializeTestInjection2()
+			throws JsonParseException, JsonMappingException, IOException {
+		jackson.readValue("~/blabla", FileLocation.class);
+	}
+
+	@Test(expected = JsonParseException.class)
+	public void deserializeTestInjection3()
+			throws JsonParseException, JsonMappingException, IOException {
+		jackson.readValue("C:\\Windows", FileLocation.class);
+	}
+
+}
Index: events/src/test/java/geniusweb/actions/LearningDoneTest.java
===================================================================
--- events/src/test/java/geniusweb/actions/LearningDoneTest.java	(revision 31)
+++ events/src/test/java/geniusweb/actions/LearningDoneTest.java	(revision 31)
@@ -0,0 +1,52 @@
+package geniusweb.actions;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import tudelft.utilities.junit.GeneralTests;
+
+public class LearningDoneTest extends GeneralTests<LearningDone> {
+	private final ObjectMapper jackson = new ObjectMapper();
+
+	private final PartyId id = new PartyId("party1");
+	private final PartyId idb = new PartyId("party2");
+
+	private final LearningDone done = new LearningDone(id);
+	private final LearningDone done1 = new LearningDone(id);
+	private final LearningDone done2 = new LearningDone(idb);
+
+	private final String endnegostring = "{\"LearningDone\":{\"actor\":\"party1\"}}";
+
+	@Override
+	public List<List<LearningDone>> getGeneralTestData() {
+		return Arrays.asList(Arrays.asList(done, done1),
+				Arrays.asList(done2));
+	}
+
+	@Override
+	public List<String> getGeneralTestStrings() {
+		return Arrays.asList("LearningDone\\[.*" + id + ".*\\]",
+				"LearningDone\\[.*" + idb + ".*\\]");
+	}
+
+	@Test
+	public void serializeEndNegoTest() throws JsonProcessingException {
+		System.out.println(jackson.writeValueAsString(done));
+		assertEquals(endnegostring, jackson.writeValueAsString(done));
+	}
+
+	@Test
+	public void deserializeEndNegoTest() throws IOException {
+		Action act = jackson.readValue(endnegostring, Action.class);
+		assertEquals(done, act);
+	}
+
+}
Index: events/src/test/java/geniusweb/inform/SettingsTest.java
===================================================================
--- events/src/test/java/geniusweb/inform/SettingsTest.java	(revision 30)
+++ events/src/test/java/geniusweb/inform/SettingsTest.java	(revision 31)
@@ -62,6 +62,5 @@
 
 		Parameters settings1 = new Parameters();
-		Parameters settings2 = new Parameters();
-		settings2.put("a", 1);
+		Parameters settings2 = new Parameters().with("a", 1);
 
 		negoinfo1 = new Settings(id, profile1, protocol1, progress1, settings1);
