diff --git a/Chroma-Core/src/main/java/buttondevteam/core/TestPrepare.java b/Chroma-Core/src/main/java/buttondevteam/core/TestPrepare.java
index 13513b4..2ab5061 100755
--- a/Chroma-Core/src/main/java/buttondevteam/core/TestPrepare.java
+++ b/Chroma-Core/src/main/java/buttondevteam/core/TestPrepare.java
@@ -19,11 +19,16 @@ 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;
 		Bukkit.setServer(Mockito.mock(Server.class, new Answer<Object>() {
 
 			@Override
-            public Object answer(InvocationOnMock invocation) {
+			public Object answer(InvocationOnMock invocation) {
 				if (returns(invocation, String.class))
 					return "test";
 				if (returns(invocation, Logger.class))
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 ab57105..eaad79b 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,5 +1,6 @@
 package buttondevteam.core.component.channel;
 
+import buttondevteam.core.TestPrepare;
 import buttondevteam.lib.TBMCSystemChatEvent;
 import buttondevteam.lib.architecture.Component;
 import buttondevteam.lib.chat.*;
@@ -35,7 +36,8 @@ public class ChannelComponent extends Component {
 	}
 
 	void registerChannelCommand(Channel channel) {
-		registerCommand(new ChannelCommand(channel));
+		if (!TestPrepare.isTest())
+			registerCommand(new ChannelCommand(channel));
 	}
 
 	@CommandClass
diff --git a/Chroma-Core/src/main/java/buttondevteam/lib/architecture/ConfigData.java b/Chroma-Core/src/main/java/buttondevteam/lib/architecture/ConfigData.java
index a9ccd5f..079b979 100644
--- a/Chroma-Core/src/main/java/buttondevteam/lib/architecture/ConfigData.java
+++ b/Chroma-Core/src/main/java/buttondevteam/lib/architecture/ConfigData.java
@@ -117,7 +117,7 @@ public class ConfigData<T> {
 		if (setter != null && value != null)
 			val = setter.apply(value);
 		else val = value;
-		if (config != null)
+		if (config.getConfig() != null)
 			setInternal(val);
 		this.value = value;
 	}
diff --git a/Chroma-Core/src/main/java/buttondevteam/lib/architecture/IHaveConfig.java b/Chroma-Core/src/main/java/buttondevteam/lib/architecture/IHaveConfig.java
index 4b10cc3..ca7e5ac 100644
--- a/Chroma-Core/src/main/java/buttondevteam/lib/architecture/IHaveConfig.java
+++ b/Chroma-Core/src/main/java/buttondevteam/lib/architecture/IHaveConfig.java
@@ -186,6 +186,7 @@ public final class IHaveConfig {
 	 */
 	public void reset(ConfigurationSection config) {
 		this.config = config;
+		datamap.forEach((path, data) -> data.reset());
 	}
 
 	/**