diff --git a/src/test/java/inf112/fiasko/roborally/element_properties/TileTypeTest.java b/src/test/java/inf112/fiasko/roborally/element_properties/TileTypeTest.java
index 4bf8f84..c685d4b 100644
--- a/src/test/java/inf112/fiasko/roborally/element_properties/TileTypeTest.java
+++ b/src/test/java/inf112/fiasko/roborally/element_properties/TileTypeTest.java
@@ -40,16 +40,6 @@ public class TileTypeTest {
         }
     }
 
-    @Test
-    public void invalidTileTypeIDReturnsNull() {
-        assertNull(TileType.getTileTypeFromID(-1));
-    }
-
-    @Test (expected = IllegalArgumentException.class)
-    public void invalidTileDirectionThrowsError() {
-        new Tile(TileType.TILE, Direction.NORTH_EAST);
-    }
-
     @Test
     public void allTilesHaveUniqueId() {
         /* This test is also done implicitly by the allTileTypesIDConversionToIDAndBack test, but that test may fail
diff --git a/src/test/java/inf112/fiasko/roborally/objects/TileTest.java b/src/test/java/inf112/fiasko/roborally/objects/TileTest.java
index 1a89e75..051e393 100644
--- a/src/test/java/inf112/fiasko/roborally/objects/TileTest.java
+++ b/src/test/java/inf112/fiasko/roborally/objects/TileTest.java
@@ -6,6 +6,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 public class TileTest {
     private Tile tile;
@@ -38,8 +39,13 @@ public class TileTest {
         assertEquals(Direction.SOUTH, tile2.getDirection());
     }
 
+    @Test
+    public void invalidTileTypeIDReturnsNull() {
+        assertNull(TileType.getTileTypeFromID(-1));
+    }
+
     @Test (expected = IllegalArgumentException.class)
-    public void invalidTileThrowsException() {
-        new Tile(TileType.CONVEYOR_BELT_FAST, Direction.NORTH_EAST);
+    public void invalidTileDirectionThrowsError() {
+        new Tile(TileType.TILE, Direction.NORTH_EAST);
     }
 }
\ No newline at end of file