diff --git a/src/test/java/seng302/models/BoatGroupTest.java b/src/test/java/seng302/models/BoatGroupTest.java
index 60c18cc7..1e82002c 100644
--- a/src/test/java/seng302/models/BoatGroupTest.java
+++ b/src/test/java/seng302/models/BoatGroupTest.java
@@ -1,3 +1,10 @@
+// TODO: 4/05/17 cir27 - Find out why this test is causing build failures
+
+//package seng302.models;
+//
+//public class BoatGroupTest {
+//
+//}
 package seng302.models;
 import seng302.*;
 import javafx.scene.paint.*;
@@ -16,7 +23,7 @@ public class BoatGroupTest {
     BoatGroup boatGroup;
     @Before
     public void setUp () {
-        Boat b = new Boat("TEST", 0.0, "T" ,0);
+        Yacht b = new Yacht("TEST", 0.0, "T" ,0);
         boatGroup = new BoatGroup(b, Color.BLACK);
     }
 
diff --git a/src/test/java/seng302/models/MarkGroupTest.java b/src/test/java/seng302/models/MarkGroupTest.java
index b91df407..c86f8f7f 100644
--- a/src/test/java/seng302/models/MarkGroupTest.java
+++ b/src/test/java/seng302/models/MarkGroupTest.java
@@ -1,131 +1,90 @@
 // TODO: 4/05/17 cir27 - Find out why this test is causing build failures
-
+//
 //package seng302.models;
 //
-//import javafx.scene.shape.Circle;
-//import seng302.*;
-//import javafx.geometry.Point2D;
-//import org.junit.Assert;
-//import org.junit.Before;
-//import org.junit.Test;
-//import seng302.models.mark.*;
-//
-///**
-// * Created by cir27 on 4/05/17.
-// */
 //public class MarkGroupTest {
-//    private MarkGroup gateMG;
-//    private MarkGroup singleMG;
 //
-//    @Before
-//    public void setUp () {
-//        Mark single = new SingleMark("SM", 0, 0 , 0);
-//        Mark gate = new GateMark(
-//                "GM",
-//                MarkType.OPEN_GATE,
-//                new SingleMark("GM1", 0, 0, 1),
-//                new SingleMark("GM2", 0, 0, 2),
-//                0,
-//                0);
-//        gateMG = new MarkGroup(gate, new Point2D(10, 10), new Point2D(20, 20));
-//        singleMG = new MarkGroup(single, new Point2D(0, 0));
-//    }
-//
-//    @Test
-//    public void hasIDSingle () {
-//        Assert.assertTrue(singleMG.hasRaceId(0));
-//        Assert.assertTrue(!singleMG.hasRaceId(100,12));
-//    }
-//
-//    @Test
-//    public void hasIdGate () {
-//        Assert.assertTrue(gateMG.hasRaceId(1));
-//        Assert.assertTrue(gateMG.hasRaceId(2));
-//        Assert.assertTrue(!gateMG.hasRaceId(100,12));
-//    }
-//
-//    @Test
-//    public void nothingOnWrongId () {
-//        double originalX = singleMG.getChildren().get(0).getLayoutX();
-//        double originalY = singleMG.getChildren().get(0).getLayoutY();
-//        singleMG.setDestination(10, 10, 0, 4);
-//        singleMG.updatePosition(400);
-//        Assert.assertTrue(originalX == singleMG.getChildren().get(0).getLayoutX());
-//        Assert.assertTrue(originalY == singleMG.getChildren().get(0).getLayoutY());
-//    }
-//
-//    @Test
-//    public void correctMovementCorrectIdSingle () {
-//        double originalX = singleMG.getChildren().get(0).getLayoutX();
-//        double originalY = singleMG.getChildren().get(0).getLayoutY();
-//        long timeinterval = 1000/60;
-//        double expectedChange = 10 / 200 * timeinterval;
-//        singleMG.setDestination(originalX + 10, originalY + 10, 0, 0);
-//        singleMG.updatePosition(timeinterval);
-//        Assert.assertTrue(originalX + expectedChange == singleMG.getChildren().get(0).getLayoutX());
-//        Assert.assertTrue(originalY + expectedChange == singleMG.getChildren().get(0).getLayoutY());
-//    }
-//
-//    @Test
-//    public void correctMovementCorrectIDGate () {
-//        double originalX1 = gateMG.getChildren().get(0).getLayoutX();
-//        double originalY1 = gateMG.getChildren().get(0).getLayoutY();
-//        double originalX2 = gateMG.getChildren().get(1).getLayoutX();
-//        double originalY2 = gateMG.getChildren().get(1).getLayoutY();
-//        long timeinterval = 1000/60;
-//        double expectedChange = 10 / 200 * timeinterval;
-//        gateMG.setDestination(originalX1 + 10, originalY1 + 10, 0, 1);
-//        gateMG.setDestination(originalX2 + 10, originalY2 + 10, 0, 2);
-//        gateMG.updatePosition(timeinterval);
-//        Assert.assertTrue(originalX1 + expectedChange == gateMG.getChildren().get(0).getLayoutX());
-//        Assert.assertTrue(originalY1 + expectedChange == gateMG.getChildren().get(0).getLayoutY());
-//        Assert.assertTrue(originalX2 + expectedChange == gateMG.getChildren().get(1).getLayoutX());
-//        Assert.assertTrue(originalY2 + expectedChange == gateMG.getChildren().get(1).getLayoutY());
-//    }
-//
-//    @Test
-//    public void correctMovementCorrectIDGateBothIDS () {
-//        gateMG.setDestination(0, 0, 0, 1, 2);
-//        double originalX1 = ((Circle) gateMG.getChildren().get(0)).getCenterX();
-//        double originalY1 = ((Circle) gateMG.getChildren().get(0)).getCenterY();
-//        double originalX2 = ((Circle) gateMG.getChildren().get(1)).getCenterX();
-//        double originalY2 = ((Circle) gateMG.getChildren().get(1)).getCenterY();
-//        long timeinterval = 1000/60;
-//        double expectedChange = 10d / 200 * timeinterval;
-//        gateMG.setDestination(originalX1 + 20, originalY1 + 20, 0, 1, 2);
-//        gateMG.updatePosition(timeinterval);
-//        System.out.println("originalX2 = " + originalX2);
-//        System.out.println("expectedChange = " + expectedChange);
-//        System.out.println("originalX1 = " + (originalY2 + expectedChange));
-//        System.out.println("((Circle) gateMG.getChildren().get(0)).getCenterX() = " + ((Circle) gateMG.getChildren().get(1)).getCenterY());
-//        System.out.println("originalX1 = " + (originalX2 + expectedChange));
-//        System.out.println("((Circle) gateMG.getChildren().get(0)).getCenterX() = " + ((Circle) gateMG.getChildren().get(1)).getCenterX());
-//        System.out.println("((Circle) gateMG.getChildren().get(0)).getCenterX() = " + ((Circle) gateMG.getChildren().get(0)).getCenterX());
-//        Assert.assertTrue(originalX1 + expectedChange == ((Circle) gateMG.getChildren().get(0)).getCenterX());
-//        Assert.assertTrue(originalY1 + expectedChange == ((Circle) gateMG.getChildren().get(0)).getCenterY());
-////        Assert.assertTrue(originalX2 + expectedChange == ((Circle) gateMG.getChildren().get(1)).getCenterX());
-////        Assert.assertTrue(originalY2 + expectedChange == ((Circle) gateMG.getChildren().get(1)).getCenterY());
-//    }
-//
-//    @Test
-//    public void correctMovementOneCorrectIDGateBothIDS () {
-//        double originalX1 = ((Circle) gateMG.getChildren().get(0)).getCenterX();
-//        double originalY1 = ((Circle) gateMG.getChildren().get(0)).getCenterY();
-//        double originalX2 = ((Circle) gateMG.getChildren().get(1)).getCenterX();
-//        double originalY2 = ((Circle) gateMG.getChildren().get(1)).getCenterY();
-//        long timeinterval = 1000/60;
-//        double expectedChange = 20 / 200 * timeinterval;
-//        gateMG.setDestination(originalX1 + 20, originalY1 + 20, 0, 1, 3);
-//        gateMG.updatePosition(timeinterval);
-//        Assert.assertTrue(originalX1 + expectedChange == ((Circle) gateMG.getChildren().get(0)).getCenterX());
-//        Assert.assertTrue(originalY1 + expectedChange == ((Circle) gateMG.getChildren().get(0)).getCenterX());
-//        Assert.assertTrue(originalX2 + expectedChange != ((Circle) gateMG.getChildren().get(1)).getCenterY());
-//        Assert.assertTrue(originalY2 + expectedChange != ((Circle) gateMG.getChildren().get(1)).getCenterY());
-//    }
-//
-//
-//    @Test
-//    public void lineUpdatesCorrectly () {
-//
-//    }
 //}
+package seng302.models;
+
+import javafx.scene.shape.Circle;
+import seng302.*;
+import javafx.geometry.Point2D;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import seng302.models.mark.*;
+
+/**
+ * Created by cir27 on 4/05/17.
+ */
+public class MarkGroupTest {
+    private MarkGroup gateMG;
+    private MarkGroup singleMG;
+
+    @Before
+    public void setUp () {
+        Mark single = new SingleMark("SM", 0, 0 , 0);
+        Mark gate = new GateMark(
+                "GM",
+                MarkType.OPEN_GATE,
+                new SingleMark("GM1", 0, 0, 1),
+                new SingleMark("GM2", 0, 0, 2),
+                0,
+                0);
+        gateMG = new MarkGroup(gate, new Point2D(10, 10), new Point2D(20, 20));
+        singleMG = new MarkGroup(single, new Point2D(0, 0));
+    }
+
+    @Test
+    public void hasIDSingle () {
+        Assert.assertTrue(singleMG.hasRaceId(0));
+        Assert.assertTrue(!singleMG.hasRaceId(100,12));
+    }
+
+    @Test
+    public void hasIdGate () {
+        Assert.assertTrue(gateMG.hasRaceId(1));
+        Assert.assertTrue(gateMG.hasRaceId(2));
+        Assert.assertTrue(!gateMG.hasRaceId(100,12));
+    }
+
+    @Test
+    public void nothingOnWrongId () {
+        double originalX = singleMG.getChildren().get(0).getLayoutX();
+        double originalY = singleMG.getChildren().get(0).getLayoutY();
+        singleMG.setDestination(10, 10, 0, 4);
+        singleMG.updatePosition(400);
+        Assert.assertTrue(originalX == singleMG.getChildren().get(0).getLayoutX());
+        Assert.assertTrue(originalY == singleMG.getChildren().get(0).getLayoutY());
+    }
+
+    @Test
+    public void correctMovementCorrectIdSingle () {
+        double originalX = singleMG.getChildren().get(0).getLayoutX();
+        double originalY = singleMG.getChildren().get(0).getLayoutY();
+        long timeinterval = 1000/60;
+        double expectedChange = 10 / 200 * timeinterval;
+        singleMG.setDestination(originalX + 10, originalY + 10, 0, 0);
+        singleMG.updatePosition(timeinterval);
+        Assert.assertTrue(originalX + expectedChange == singleMG.getChildren().get(0).getLayoutX());
+        Assert.assertTrue(originalY + expectedChange == singleMG.getChildren().get(0).getLayoutY());
+    }
+
+    @Test
+    public void correctMovementCorrectIDGate () {
+        double originalX1 = gateMG.getChildren().get(0).getLayoutX();
+        double originalY1 = gateMG.getChildren().get(0).getLayoutY();
+        double originalX2 = gateMG.getChildren().get(1).getLayoutX();
+        double originalY2 = gateMG.getChildren().get(1).getLayoutY();
+        long timeinterval = 1000/60;
+        double expectedChange = 10 / 200 * timeinterval;
+        gateMG.setDestination(originalX1 + 10, originalY1 + 10, 0, 1);
+        gateMG.setDestination(originalX2 + 10, originalY2 + 10, 0, 2);
+        gateMG.updatePosition(timeinterval);
+        Assert.assertTrue(originalX1 + expectedChange == gateMG.getChildren().get(0).getLayoutX());
+        Assert.assertTrue(originalY1 + expectedChange == gateMG.getChildren().get(0).getLayoutY());
+        Assert.assertTrue(originalX2 + expectedChange == gateMG.getChildren().get(1).getLayoutX());
+        Assert.assertTrue(originalY2 + expectedChange == gateMG.getChildren().get(1).getLayoutY());
+    }
+}