diff --git a/src/test/java/seng302/TestRaceTimer.java b/src/test/java/seng302/TestRaceTimer.java
deleted file mode 100644
index 8fd5b645..00000000
--- a/src/test/java/seng302/TestRaceTimer.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package seng302;
-
-import org.junit.Test;
-
-
-public class TestRaceTimer {
-    @Test
-    public void testPositiveTimeString(){
-//        RaceViewController controller = new RaceViewController();
-//        String result = controller.convertTimeToMinutesSeconds(61);
-//
-//        assertTrue(result.equals("01:01"));
-   }
-
-   @Test
-   public void testNegativeTimeString(){
-//		RaceViewController controller = new RaceViewController();
-//        String result = controller.convertTimeToMinutesSeconds(-61);
-//
-//        assertTrue(result.equals("-01:01"));
-    }
-}
diff --git a/src/test/java/seng302/models/YachtTest.java b/src/test/java/seng302/models/YachtTest.java
index 53e0ac41..49b73daa 100644
--- a/src/test/java/seng302/models/YachtTest.java
+++ b/src/test/java/seng302/models/YachtTest.java
@@ -67,12 +67,10 @@ public class YachtTest {
         values.put(350d, downwindRight);
 
         for (Double begin : values.keySet()) {
-            System.out.println(begin);
             y1.setHeading(begin);
             y1.turnToVMG();
             for (int i = 0; i < 200; i++) {
                 y1.runAutoPilot();
-                System.out.println(y1.getHeading());
             }
             y1.disableAutoPilot();
             assertEquals(values.get(begin), y1.getHeading(), 5.0);
diff --git a/src/test/java/seng302/visualiser/ClientToServerTests/RegularPacketsTest.java b/src/test/java/seng302/visualiser/ClientToServerTests/RegularPacketsTest.java
index e8064a6c..bf5fcab1 100644
--- a/src/test/java/seng302/visualiser/ClientToServerTests/RegularPacketsTest.java
+++ b/src/test/java/seng302/visualiser/ClientToServerTests/RegularPacketsTest.java
@@ -74,7 +74,7 @@ public class RegularPacketsTest {
         serverThread.terminate();
         clientThread.setSocketToClose();
         GameState.setCurrentStage(GameStages.LOBBYING);
-        for (int i = 0; i<6; i++)
-            SleepThreadMaxDelay(); //Make sure socket is closed.
+        for (int i = 0; i<20; i++)
+            SleepThreadMaxDelay(); //Make sure socket is closed and toolkit remade.
     }
 }