diff --git a/source/microservices/game_server/source/settings.gradle b/source/microservices/game_server/source/settings.gradle
diff --git a/...er/source/src/main/java/com/yngvark/gridwalls/microservices/gameserver/GameRpcServer.java b/...er/source/src/main/java/com/yngvark/gridwalls/microservices/gameserver/GameRpcServer.java
diff --git a/...r/source/src/main/java/com/yngvark/gridwalls/microservices/gameserver/ICanRunAndStop.java b/...r/source/src/main/java/com/yngvark/gridwalls/microservices/gameserver/ICanRunAndStop.java
diff --git a/...game_server/source/src/main/java/com/yngvark/gridwalls/microservices/gameserver/Main.java b/...game_server/source/src/main/java/com/yngvark/gridwalls/microservices/gameserver/Main.java
diff --git a/...ource/src/main/java/com/yngvark/gridwalls/microservices/gameserver/RpcRequestHandler.java b/...ource/src/main/java/com/yngvark/gridwalls/microservices/gameserver/RpcRequestHandler.java
diff --git a/source/microservices/game_server/start.sh b/source/microservices/game_server/start.sh
diff --git a/source/microservices/game_server/test/container/docker-compose.yml b/source/microservices/game_server/test/container/docker-compose.yml
diff --git a/source/microservices/game_server/test/container/start.sh b/source/microservices/game_server/test/container/start.sh
diff --git a/source/microservices/game_server/test/container/stop.sh b/source/microservices/game_server/test/container/stop.sh
diff --git a/source/microservices/game_server/test/source/build.gradle b/source/microservices/game_server/test/source/build.gradle
diff --git a/source/microservices/game_server/test/source/gameserver_test.ipr b/source/microservices/game_server/test/source/gameserver_test.ipr
diff --git a/source/microservices/game_server/test/source/gradle/wrapper/gradle-wrapper.jar b/source/microservices/game_server/test/source/gradle/wrapper/gradle-wrapper.jar
diff --git a/source/microservices/game_server/test/source/gradle/wrapper/gradle-wrapper.properties b/source/microservices/game_server/test/source/gradle/wrapper/gradle-wrapper.properties
diff --git a/source/microservices/game_server/test/source/gradlew b/source/microservices/game_server/test/source/gradlew
diff --git a/source/microservices/game_server/test/source/gradlew.bat b/source/microservices/game_server/test/source/gradlew.bat
diff --git a/source/microservices/game_server/test/source/settings.gradle b/source/microservices/game_server/test/source/settings.gradle
diff --git a/...ource/src/test/java/com/yngvark/gridwalls/microservices/gameserver/GameRpcServerTest.java b/...ource/src/test/java/com/yngvark/gridwalls/microservices/gameserver/GameRpcServerTest.java
diff --git a/source/microservices/game_server/test/start.sh b/source/microservices/game_server/test/start.sh
diff --git a/source/microservices/zombie/source/build.gradle b/source/microservices/zombie/source/build.gradle
@@ -14,7 +14,7 @@ buildscript {
         // maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
     }
     dependencies {
-        classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.0-M2'
+        classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.0-M4'
     }
 }
 
@@ -32,7 +32,7 @@ dependencies {
     // The production code uses the SLF4J logging API at compile time
     compile 'org.slf4j:slf4j-api:1.7.21'
     compile 'com.rabbitmq:amqp-client:3.6.3'
-    compile 'org.apache.commons:commons-lang3:3.1'
+    //compile 'org.apache.commons:commons-lang3:3.1'
     compile 'org.mockito:mockito-core:1.10.19'
 
     compileOnly "org.projectlombok:lombok:1.16.10"
@@ -44,14 +44,14 @@ dependencies {
 
     // Needed for running JUnit5 tests in Intellij.
     // Not needed for running "gradle test"
-    testCompile("org.junit.platform:junit-platform-runner:1.0.0-M2")
+    testCompile("org.junit.platform:junit-platform-runner:1.0.0-M4")
 
-    testCompile("org.junit.jupiter:junit-jupiter-api:5.0.0-M2")
-    testRuntime("org.junit.jupiter:junit-jupiter-engine:5.0.0-M2")
+    testCompile("org.junit.jupiter:junit-jupiter-api:5.0.0-M4")
+    testRuntime("org.junit.jupiter:junit-jupiter-engine:5.0.0-M4")
 }
 
 junitPlatform {
-    platformVersion = "1.0.0-M2"
+    platformVersion = "1.0.0-M4"
 }
 
 idea {

diff --git a/...zombie/source/src/test/java/com/yngvark/gridwalls/netcom/gameconfig/DeserializerTest.java b/...zombie/source/src/test/java/com/yngvark/gridwalls/netcom/gameconfig/DeserializerTest.java
@@ -5,8 +5,8 @@
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.expectThrows;
 
 public class DeserializerTest {
     @Test
@@ -34,7 +34,7 @@ public void error_if_no_map_height() throws Exception {
         String serialized = "[GameInfo] mapWidth=10";
 
         // When
-        Throwable exception = expectThrows(RuntimeException.class,  () -> deserializer.deserialize(serialized));
+        Throwable exception = assertThrows(RuntimeException.class,  () -> deserializer.deserialize(serialized));
 
         // Then
         System.out.println(exception);
@@ -48,7 +48,7 @@ public void error_if_no_map_width() throws Exception {
         String serialized = "[GameInfo] mapHeight=10";
 
         // When
-        Throwable exception = expectThrows(RuntimeException.class,  () -> deserializer.deserialize(serialized));
+        Throwable exception = assertThrows(RuntimeException.class,  () -> deserializer.deserialize(serialized));
 
         // Then
         System.out.println(exception);
@@ -62,7 +62,7 @@ public void error_if_no_sleep_time() throws Exception {
         String serialized = "[GameInfo] mapHeight=10 mapWidth=10";
 
         // When
-        Throwable exception = expectThrows(RuntimeException.class,  () -> deserializer.deserialize(serialized));
+        Throwable exception = assertThrows(RuntimeException.class,  () -> deserializer.deserialize(serialized));
 
         // Then
         System.out.println(exception);

diff --git a/source/microservices/zombie/source/zombie.iml b/source/microservices/zombie/source/zombie.iml
diff --git a/source/microservices/zombie/source/zombie.ipr b/source/microservices/zombie/source/zombie.ipr
diff --git a/source/microservices/zombie/test/source/src/test/java/test_helper/Broker.java b/source/microservices/zombie/test/source/src/test/java/test_helper/Broker.java
@@ -1,5 +1,8 @@
 package test_helper;
 
+import com.yngvark.gridwalls.netcom.GameRpcServer;
+import com.yngvark.gridwalls.netcom.RpcRequestHandler;
+
 import java.io.IOException;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeoutException;

diff --git a/source/microservices/zombie/test/source/src/test/java/test_helper/RabbitBroker.java b/source/microservices/zombie/test/source/src/test/java/test_helper/RabbitBroker.java
@@ -8,6 +8,8 @@
 import com.rabbitmq.client.Consumer;
 import com.rabbitmq.client.DefaultConsumer;
 import com.rabbitmq.client.Envelope;
+import com.yngvark.gridwalls.netcom.GameRpcServer;
+import com.yngvark.gridwalls.netcom.RpcRequestHandler;
 
 import java.io.IOException;
 import java.util.Map;

diff --git a/source/microservices/zombie/test/source/src/test/java/test_helper/TestHelper.java b/source/microservices/zombie/test/source/src/test/java/test_helper/TestHelper.java
@@ -1,5 +1,6 @@
 package test_helper;
 
+import com.yngvark.gridwalls.netcom.GameRpcServer;
 import util.lib.InputStreamListener;
 import util.lib.ProcessKiller;
 import util.lib.ProcessStarter;