diff --git a/src/test/java/beamline/tests/AlgorithmTest.java b/src/test/java/beamline/tests/AlgorithmTest.java
index e1ca19e9d291d5691da1572ba82fba47e85e9a19..a1041353f47ff3478dade200aeeddc6131c5ddfa 100644
--- a/src/test/java/beamline/tests/AlgorithmTest.java
+++ b/src/test/java/beamline/tests/AlgorithmTest.java
@@ -31,10 +31,10 @@ public class AlgorithmTest {
 		StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
 		env
 			.fromElements(
-				BEvent.create("p", "3", "c1"),
-				BEvent.create("p", "7", "c1"),
-				BEvent.create("p", "11", "c1"),
-				BEvent.create("p", "13", "c1"))
+				BEvent.create("p", "c1", "3"),
+				BEvent.create("p", "c1", "7"),
+				BEvent.create("p", "c1", "11"),
+				BEvent.create("p", "c1", "13"))
 			.keyBy(BEvent::getProcessName)
 			.flatMap(m)
 			.executeAndCollect().forEachRemaining((StringResponse e) -> {
diff --git a/src/test/java/beamline/tests/FiltersTest.java b/src/test/java/beamline/tests/FiltersTest.java
index 591cc3f15e6f610a00584ddb161067d7cceb2c4a..87a3d1467a536519f90fd22265c435d86a81df46 100644
--- a/src/test/java/beamline/tests/FiltersTest.java
+++ b/src/test/java/beamline/tests/FiltersTest.java
@@ -18,16 +18,16 @@ public class FiltersTest {
 	public void test_exclude_activities_on_name_filter() throws EventException, Exception {
 		ExcludeActivitiesFilter f = new ExcludeActivitiesFilter("A");
 		
-		assertTrue(f.filter(BEvent.create("", "B", "")));
-		assertFalse(f.filter(BEvent.create("", "A", "")));
+		assertTrue(f.filter(BEvent.create("", "", "B")));
+		assertFalse(f.filter(BEvent.create("", "", "A")));
 	}
 	
 	@Test
 	public void test_retain_activities_on_name_filter() throws EventException {
 		RetainActivitiesFilter f = new RetainActivitiesFilter("A");
 
-		assertTrue(f.filter(BEvent.create("", "A", "")));
-		assertFalse(f.filter(BEvent.create("", "B", "")));
+		assertTrue(f.filter(BEvent.create("", "", "A")));
+		assertFalse(f.filter(BEvent.create("", "", "B")));
 	}
 	
 	@Test
diff --git a/src/test/java/beamline/tests/MapperTest.java b/src/test/java/beamline/tests/MapperTest.java
index f4dc59165ea1693d26b013e6f18a6258ec3bc8b0..1e7ddeb7f8b0192d825380e603b32d62b9b9405f 100644
--- a/src/test/java/beamline/tests/MapperTest.java
+++ b/src/test/java/beamline/tests/MapperTest.java
@@ -23,14 +23,14 @@ public class MapperTest {
 		StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
 		env
 			.fromElements(
-				BEvent.create("p", "K", "c"),
-				BEvent.create("p", "A", "c2"),
-				BEvent.create("p", "A", "c"),
-				BEvent.create("p", "B", "c"),
-				BEvent.create("p", "B", "c2"),
-				BEvent.create("p", "A", "c"),
-				BEvent.create("p", "A", "c2"),
-				BEvent.create("p", "C", "c"))
+				BEvent.create("p", "c", "K"),
+				BEvent.create("p", "c2", "A"),
+				BEvent.create("p", "c", "A"),
+				BEvent.create("p", "c", "B"),
+				BEvent.create("p", "c2", "B"),
+				BEvent.create("p", "c", "A"),
+				BEvent.create("p", "c2", "A"),
+				BEvent.create("p", "c", "C"))
 			.keyBy(BEvent::getProcessName)
 			.flatMap(new InfiniteSizeDirectlyFollowsMapper())
 			.executeAndCollect().forEachRemaining((DirectlyFollowsRelation e) -> {
diff --git a/src/test/java/beamline/tests/ResponsesTest.java b/src/test/java/beamline/tests/ResponsesTest.java
index b32b63a4058d83bcc9bf74abc3997e67442a4bb7..4c377e8d6f44545012422fec2cacc1e7f44005f3 100644
--- a/src/test/java/beamline/tests/ResponsesTest.java
+++ b/src/test/java/beamline/tests/ResponsesTest.java
@@ -29,16 +29,16 @@ public class ResponsesTest {
 	
 	@Test
 	public void directly_follow_tests() throws EventException {
-		BEvent e1 = BEvent.create("p", "a", "c1");
-		BEvent e2 = BEvent.create("p", "a", "c2");
+		BEvent e1 = BEvent.create("p", "c1", "a");
+		BEvent e2 = BEvent.create("p", "c2", "a");
 		
 		assertThrows(IllegalArgumentException.class, () -> new DirectlyFollowsRelation(e1, e2));
 		
-		BEvent e21 = BEvent.create("p", "a", "c1");
-		BEvent e22 = BEvent.create("p", "b", "c1");
-		BEvent e23 = BEvent.create("p", "a", "c2");
-		BEvent e24 = BEvent.create("p", "b", "c2");
-		BEvent e25 = BEvent.create("p", "d", "c1");
+		BEvent e21 = BEvent.create("p", "c1", "a");
+		BEvent e22 = BEvent.create("p", "c1", "b");
+		BEvent e23 = BEvent.create("p", "c2", "a");
+		BEvent e24 = BEvent.create("p", "c2", "b");
+		BEvent e25 = BEvent.create("p", "c1", "d");
 
 		DirectlyFollowsRelation df = new DirectlyFollowsRelation(e21, e22);
 		DirectlyFollowsRelation df2 = new DirectlyFollowsRelation(e23, e24);
@@ -53,15 +53,15 @@ public class ResponsesTest {
 	
 	@Test
 	public void test_equals() throws EventException {
-		BEvent e21 = BEvent.create("p", "a", "c1");
-		BEvent e22 = BEvent.create("p", "b", "c1");
-		BEvent e23 = BEvent.create("p", "a", "c2");
-		BEvent e24 = BEvent.create("p", "b", "c2");
+		BEvent e21 = BEvent.create("p", "c1", "a");
+		BEvent e22 = BEvent.create("p", "c1", "b");
+		BEvent e23 = BEvent.create("p", "c2", "a");
+		BEvent e24 = BEvent.create("p", "c2", "b");
 		
 		DirectlyFollowsRelation df = new DirectlyFollowsRelation(e21, e22);
 		DirectlyFollowsRelation df2 = new DirectlyFollowsRelation(e23, e24);
 		
-		assertThat(df).isEqualTo(df).hasSameHashCodeAs(df2);
+		assertThat(df).isEqualTo(df).hasSameHashCodeAs(df2).isNotEqualTo("").isNotEqualTo(null);
 	}
 	
 	@Test