diff --git a/src/test/java/test/java/com/graywolf336/jail/BenchmarkTest.java b/src/test/java/test/java/com/graywolf336/jail/BenchmarkTest.java
index dac8ff2..4a3dbc2 100644
--- a/src/test/java/test/java/com/graywolf336/jail/BenchmarkTest.java
+++ b/src/test/java/test/java/com/graywolf336/jail/BenchmarkTest.java
@@ -45,7 +45,7 @@ public class BenchmarkTest extends AbstractBenchmark {
         assertTrue(creator.setup());
         main = creator.getMain();
         assertNotNull("The JailMain class is null.", main);
-        assertTrue("The adding of a jail failed.", creator.addJail());
+        assertTrue("The adding of a jail failed.", creator.addJail("testingJail"));
         assertFalse("There are no jails.", main.getJailManager().getJails().isEmpty());
 
         for(int i = 0; i < 1000; i++) {
diff --git a/src/test/java/test/java/com/graywolf336/jail/TestJailAPI.java b/src/test/java/test/java/com/graywolf336/jail/TestJailAPI.java
index 501149a..f3275a7 100644
--- a/src/test/java/test/java/com/graywolf336/jail/TestJailAPI.java
+++ b/src/test/java/test/java/com/graywolf336/jail/TestJailAPI.java
@@ -36,6 +36,7 @@ public class TestJailAPI {
         assertTrue(creator.setup());
         main = creator.getMain();
         assertNotNull("The JailMain class is null.", main);
+        assertTrue("The adding of a jail failed.", creator.addJail("TestJailAPI"));
     }
 
     @AfterClass
diff --git a/src/test/java/test/java/com/graywolf336/jail/TestJailVote.java b/src/test/java/test/java/com/graywolf336/jail/TestJailVote.java
index 2601b18..5fd5d75 100644
--- a/src/test/java/test/java/com/graywolf336/jail/TestJailVote.java
+++ b/src/test/java/test/java/com/graywolf336/jail/TestJailVote.java
@@ -37,7 +37,7 @@ public class TestJailVote {
         assertTrue(creator.setup());
         main = creator.getMain();
         assertNotNull("The JailMain class is null.", main);
-        assertTrue("The adding of a jail failed.", creator.addJail());
+        assertTrue("The adding of a jail failed.", creator.addJail("TestJailVote"));
     }
 
     @AfterClass
diff --git a/src/test/java/test/java/com/graywolf336/jail/util/TestInstanceCreator.java b/src/test/java/test/java/com/graywolf336/jail/util/TestInstanceCreator.java
index a5ab284..da921fd 100644
--- a/src/test/java/test/java/com/graywolf336/jail/util/TestInstanceCreator.java
+++ b/src/test/java/test/java/com/graywolf336/jail/util/TestInstanceCreator.java
@@ -15,6 +15,7 @@ import java.io.File;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;
 import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -51,6 +52,7 @@ import com.graywolf336.jail.beans.Jail;
 
 @PrepareForTest({ CraftItemFactory.class })
 public class TestInstanceCreator {
+    private Random r;
     private JailMain main;
     private Server mockServer;
     private Player mockPlayer;
@@ -65,6 +67,7 @@ public class TestInstanceCreator {
 
     @SuppressWarnings("deprecation")
     public boolean setup() {
+        r = new Random();
         try {
             pluginDirectory.mkdirs();
             Assert.assertTrue(pluginDirectory.exists());
@@ -346,18 +349,18 @@ public class TestInstanceCreator {
         }
     }
     
-    public boolean addJail() {
-        if(main.getJailManager().getJails().isEmpty()) {
-            Jail j = new Jail(main, "testingJail");
+    public boolean addJail(String name) {
+        if(main.getJailManager().isValidJail(name)) {
+            return false;
+        }else {
+            Jail j = new Jail(main, name);
             j.setWorld("world");
-            j.setMaxPoint(new int[] { 9, 63, -238 });
-            j.setMinPoint(new int[] { 23, 70, -242 });
-            j.setTeleportIn(new Location(main.getServer().getWorld("world"), 11.469868464778077, 65.0, -239.27944647045672, Float.valueOf("38.499817"), Float.valueOf("2.0000453")));
-            j.setTeleportFree(new Location(main.getServer().getWorld("world"), 27.947015843504765, 65.0, -218.8108042076112, Float.valueOf("90.54981"), Float.valueOf("12.500043")));
+            j.setMaxPoint(new int[] { r.nextInt(), r.nextInt(256), r.nextInt() });
+            j.setMinPoint(new int[] { r.nextInt(), r.nextInt(54), r.nextInt() });
+            j.setTeleportIn(new Location(main.getServer().getWorld("world"), r.nextInt(), r.nextInt(256), r.nextInt(), Float.valueOf("38.499817"), Float.valueOf("2.0000453")));
+            j.setTeleportFree(new Location(main.getServer().getWorld("world"), r.nextInt(), r.nextInt(256), r.nextInt(), Float.valueOf("90.54981"), Float.valueOf("12.500043")));
             main.getJailManager().addJail(j, false);
             return true;
-        }else {
-            return false;
         }
     }