diff --git a/src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatMeshType.java b/src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatMeshType.java
index 4be41d90..fbd85eba 100644
--- a/src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatMeshType.java
+++ b/src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatMeshType.java
@@ -13,7 +13,7 @@ public enum BoatMeshType {
     PIRATE_SHIP("pirateship_hull.stl", "pirateship_mast.stl", -0.5415, "pirateship_mainsail.stl",
         -0.5415, "pirateship_frontsail.stl", true, 1.2, 1.6, 1.2),
     DUCKY("ducky_hull.stl", "ducky_mast.stl", -2.18539, "ducky_sail.stl", -2.18539, "ducky_eyes.stl", false, 1.2, 1.1, 1.4),
-    PARROT("parrot_hull.stl", null, 0, "parrot_sail.stl", 0, "parrot_features.stl", true, 1, 1, 1),
+    PARROT("parrot_hull.stl", null, 0, "parrot_features.stl", 0, "parrot_sail.stl", true, 1, 1, 1),
     WAKA("waka_hull.stl", "waka_mast.stl", 0, "waka_sail.stl", 0, null, true, 1.7, 0.5, 1.5);
 
     final String hullFile, mastFile, sailFile, jibFile;
diff --git a/src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java b/src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java
index e454b666..828a4492 100644
--- a/src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java
+++ b/src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java
@@ -100,19 +100,19 @@ public class ModelFactory {
             mast.setMaterial(new PhongMaterial(primaryColour));
             boatAssets.getChildren().add(mast);
         } else {
-            boatAssets.getChildren().add(new Group());
+            boatAssets.getChildren().add(new MeshView());
         }
 
         MeshView sail = importBoatSTL(boatType.sailFile);
         sail.setMaterial(
-            new PhongMaterial(boatType == BoatMeshType.PARROT ? Color.DARKGRAY : Color.WHITE)
+            new PhongMaterial(boatType == BoatMeshType.PARROT ? Color.BLACK : Color.WHITE)
         );
         boatAssets.getChildren().add(sail);
 
         if (boatType.jibFile != null) {
             MeshView jib = importBoatSTL(boatType.jibFile);
             jib.setMaterial(
-                new PhongMaterial(boatType == BoatMeshType.PARROT ? Color.BLACK : Color.WHITE)
+                new PhongMaterial(boatType == BoatMeshType.PARROT ? Color.DARKGRAY : Color.WHITE)
             );
             boatAssets.getChildren().add(jib);
         }
diff --git a/src/test/java/seng302/utilities/MapMakerTest.java b/src/test/java/seng302/utilities/MapMakerTest.java
new file mode 100644
index 00000000..dc2af1b1
--- /dev/null
+++ b/src/test/java/seng302/utilities/MapMakerTest.java
@@ -0,0 +1,9 @@
+package seng302.utilities;
+
+/**
+ * Created by cir27 on 28/09/17.
+ */
+public class MapMakerTest {
+//    @Test
+
+}
diff --git a/src/test/java/steps/CustomMapsSteps.java b/src/test/java/steps/CustomMapsSteps.java
index 5d7a2f1d..42e9314b 100644
--- a/src/test/java/steps/CustomMapsSteps.java
+++ b/src/test/java/steps/CustomMapsSteps.java
@@ -16,26 +16,26 @@ public class CustomMapsSteps {
 
     @Given("^that the game has multiple race xml files$")
     public void that_the_game_has_multiple_race_xml_files() throws Throwable {
-//        mapMaker = MapMaker.getInstance();
-//        String firstMap = mapMaker.getCurrentRacePath();
-//        int numMaps = 0;
-//        do {
-//            mapMaker.next();
-//            numMaps++;
-//        } while (!mapMaker.getCurrentRacePath().equals(firstMap));
-//        Assert.assertTrue(numMaps >= 2);
+        mapMaker = MapMaker.getInstance();
+        String firstMap = mapMaker.getCurrentRacePath();
+        int numMaps = 0;
+        do {
+            mapMaker.next();
+            numMaps++;
+        } while (!mapMaker.getCurrentRacePath().equals(firstMap));
+        Assert.assertTrue(numMaps >= 2);
     }
 
     @Then("^all of them can be seen$")
     public void all_of_them_can_be_seen() throws Throwable {
-//        File[] files = new File(this.getClass().getResource("/maps/").getPath()).listFiles();
-//        for (File file : files) {
-//            if (file.isFile()) {
-//                Assert.assertTrue(file.getAbsolutePath().equals(mapMaker.getCurrentRacePath()));
-//                mapMaker.next();
-//                System.out.println(file.getAbsolutePath());
-//            }
-//        }
+        File[] files = new File(this.getClass().getResource("/maps/").getPath()).listFiles();
+        for (File file : files) {
+            if (file.isFile()) {
+                Assert.assertTrue(file.getAbsolutePath().equals(mapMaker.getCurrentRacePath()));
+                mapMaker.next();
+                System.out.println(file.getAbsolutePath());
+            }
+        }
     }
 
     @Given("^that I choose a race$")