diff --git a/src/test/java/com/gmail/nossr50/datatypes/BlockLocationHistoryTest.java b/src/test/java/com/gmail/nossr50/datatypes/BlockLocationHistoryTest.java
new file mode 100644
index 000000000..5e9499a17
--- /dev/null
+++ b/src/test/java/com/gmail/nossr50/datatypes/BlockLocationHistoryTest.java
@@ -0,0 +1,37 @@
+package com.gmail.nossr50.datatypes;
+
+import org.bukkit.Location;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class BlockLocationHistoryTest {
+    @Test
+    public void testRemovesOldestElement() {
+        BlockLocationHistory history = new BlockLocationHistory(2);
+        Location locationA = new Location(null, 0, 1, 2);
+        Location locationB = new Location(null, 1, 2, 3);
+        Location locationC = new Location(null, 2, 3, 4);
+
+        history.add(locationA);
+        history.add(locationB);
+        history.add(locationC);
+        Assert.assertFalse(history.contains(locationA));
+        Assert.assertTrue(history.contains(locationB));
+        Assert.assertTrue(history.contains(locationC));
+    }
+
+    @Test
+    public void testSupportsDuplicateElement() {
+        BlockLocationHistory history = new BlockLocationHistory(2);
+        Location locationA = new Location(null, 0, 1, 2);
+        Location locationB = new Location(null, 1, 2, 3);
+
+        history.add(locationA);
+        history.add(locationA);
+        history.add(locationB);
+        Assert.assertTrue(history.contains(locationA));
+        Assert.assertTrue(history.contains(locationB));
+        history.add(locationB);
+        Assert.assertFalse(history.contains(locationA));
+    }
+}
diff --git a/src/test/java/ChunkStoreTest.java b/src/test/java/com/gmail/nossr50/util/blockmeta/ChunkStoreTest.java
similarity index 99%
rename from src/test/java/ChunkStoreTest.java
rename to src/test/java/com/gmail/nossr50/util/blockmeta/ChunkStoreTest.java
index 2290ee103..5f1af96da 100644
--- a/src/test/java/ChunkStoreTest.java
+++ b/src/test/java/com/gmail/nossr50/util/blockmeta/ChunkStoreTest.java
@@ -1,10 +1,10 @@
-import com.gmail.nossr50.util.blockmeta.*;
+package com.gmail.nossr50.util.blockmeta;
+
 import com.google.common.io.Files;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.junit.*;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;