diff --git a/Chroma-Core/src/main/java/buttondevteam/core/TestPrepare.java b/Chroma-Core/src/main/java/buttondevteam/core/TestPrepare.java
index 2ab5061..6a48cf8 100755
--- a/Chroma-Core/src/main/java/buttondevteam/core/TestPrepare.java
+++ b/Chroma-Core/src/main/java/buttondevteam/core/TestPrepare.java
@@ -2,6 +2,7 @@ package buttondevteam.core;
 
 import buttondevteam.core.component.channel.Channel;
 import buttondevteam.core.component.channel.ChannelComponent;
+import buttondevteam.lib.ChromaUtils;
 import buttondevteam.lib.architecture.Component;
 import buttondevteam.lib.chat.Color;
 import buttondevteam.lib.chat.TBMCChatAPI;
@@ -19,12 +20,9 @@ import java.util.Collections;
 import java.util.logging.Logger;
 
 public class TestPrepare {
-	private static boolean test = false;
-
-	public static boolean isTest() { return test; }
 
 	public static void PrepareServer() {
-		test = true;
+		ChromaUtils.setTest(); //Needs to be in a separate class because of the potential lack of Mockito
 		Bukkit.setServer(Mockito.mock(Server.class, new Answer<Object>() {
 
 			@Override
diff --git a/Chroma-Core/src/main/java/buttondevteam/core/component/channel/ChannelComponent.java b/Chroma-Core/src/main/java/buttondevteam/core/component/channel/ChannelComponent.java
index eaad79b..6f807f9 100644
--- a/Chroma-Core/src/main/java/buttondevteam/core/component/channel/ChannelComponent.java
+++ b/Chroma-Core/src/main/java/buttondevteam/core/component/channel/ChannelComponent.java
@@ -1,6 +1,6 @@
 package buttondevteam.core.component.channel;
 
-import buttondevteam.core.TestPrepare;
+import buttondevteam.lib.ChromaUtils;
 import buttondevteam.lib.TBMCSystemChatEvent;
 import buttondevteam.lib.architecture.Component;
 import buttondevteam.lib.chat.*;
@@ -36,7 +36,7 @@ public class ChannelComponent extends Component {
 	}
 
 	void registerChannelCommand(Channel channel) {
-		if (!TestPrepare.isTest())
+		if (!ChromaUtils.isTest())
 			registerCommand(new ChannelCommand(channel));
 	}
 
diff --git a/Chroma-Core/src/main/java/buttondevteam/lib/ChromaUtils.java b/Chroma-Core/src/main/java/buttondevteam/lib/ChromaUtils.java
index 51bbf98..ef818c9 100644
--- a/Chroma-Core/src/main/java/buttondevteam/lib/ChromaUtils.java
+++ b/Chroma-Core/src/main/java/buttondevteam/lib/ChromaUtils.java
@@ -86,4 +86,16 @@ public final class ChromaUtils {
 			return what.get();
 		return def;
 	}
+
+	private static boolean test = false;
+
+	/**
+	 * Returns true while unit testing.
+	 */
+	public static boolean isTest() { return test; }
+
+	/**
+	 * Call when unit testing.
+	 */
+	public static void setTest() { test = true; }
 }