diff --git a/src/main/java/ninjabrainbot/model/datastate/common/DetachedDomainModel.java b/src/main/java/ninjabrainbot/model/datastate/common/DetachedDomainModel.java
index 5e730c3..2eb4418 100644
--- a/src/main/java/ninjabrainbot/model/datastate/common/DetachedDomainModel.java
+++ b/src/main/java/ninjabrainbot/model/datastate/common/DetachedDomainModel.java
@@ -8,7 +8,6 @@
 import ninjabrainbot.model.domainmodel.IDomainModel;
 import ninjabrainbot.model.domainmodel.IFundamentalComponent;
 import ninjabrainbot.model.domainmodel.IInferredComponent;
-import ninjabrainbot.model.domainmodel.SerializationException;
 
 public class DetachedDomainModel implements IDomainModel {
 
diff --git a/src/main/java/ninjabrainbot/model/domainmodel/DomainModel.java b/src/main/java/ninjabrainbot/model/domainmodel/DomainModel.java
index 0ea185f..930cb6f 100644
--- a/src/main/java/ninjabrainbot/model/domainmodel/DomainModel.java
+++ b/src/main/java/ninjabrainbot/model/domainmodel/DomainModel.java
@@ -210,7 +210,7 @@ public void deserialize(ObjectInput objectInput) throws SerializationException {
 		if (deserializedFundamentalComponents.size() != fundamentalComponents.size())
 			throw new SerializationException("Expected there to be " + (fundamentalComponents.size()) + " deserialized objects, but got " + deserializedFundamentalComponents.size());
 
-		try{
+		try {
 			acquireWriteLock();
 			for (IFundamentalComponent<?, ?> fundamentalComponent : fundamentalComponents) {
 				String uniqueId = fundamentalComponent.uniqueId();
diff --git a/src/main/java/ninjabrainbot/model/domainmodel/IDomainModel.java b/src/main/java/ninjabrainbot/model/domainmodel/IDomainModel.java
index 744a178..34efa5f 100644
--- a/src/main/java/ninjabrainbot/model/domainmodel/IDomainModel.java
+++ b/src/main/java/ninjabrainbot/model/domainmodel/IDomainModel.java
@@ -1,6 +1,5 @@
 package ninjabrainbot.model.domainmodel;
 
-import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 
diff --git a/src/main/java/ninjabrainbot/model/domainmodel/SerializationException.java b/src/main/java/ninjabrainbot/model/domainmodel/SerializationException.java
index b17004f..864e0b0 100644
--- a/src/main/java/ninjabrainbot/model/domainmodel/SerializationException.java
+++ b/src/main/java/ninjabrainbot/model/domainmodel/SerializationException.java
@@ -6,7 +6,7 @@ public SerializationException(String message) {
 		super(message);
 	}
 
-	public SerializationException(String message, Throwable cause){
+	public SerializationException(String message, Throwable cause) {
 		super(message, cause);
 	}
 
diff --git a/src/test/java/ninjabrainbot/integrationtests/CalibrationIntegrationTests.java b/src/test/java/ninjabrainbot/integrationtests/CalibrationIntegrationTests.java
index c669753..d1b0544 100644
--- a/src/test/java/ninjabrainbot/integrationtests/CalibrationIntegrationTests.java
+++ b/src/test/java/ninjabrainbot/integrationtests/CalibrationIntegrationTests.java
@@ -9,9 +9,11 @@
 import ninjabrainbot.util.TestUtils;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 
 public class CalibrationIntegrationTests {
 
+	@DisabledIfEnvironmentVariable(named = "CI", matches = "true")
 	@Test
 	public void canOpenDialog() {
 		// Arrange
@@ -29,6 +31,7 @@ public void canOpenDialog() {
 		}
 	}
 
+	@DisabledIfEnvironmentVariable(named = "CI", matches = "true")
 	@Test
 	public void canOpenDialog_manualCalibration() {
 		// Arrange
diff --git a/src/test/java/ninjabrainbot/integrationtests/ThemeEditorIntegrationTests.java b/src/test/java/ninjabrainbot/integrationtests/ThemeEditorIntegrationTests.java
index c1d9670..2b3b377 100644
--- a/src/test/java/ninjabrainbot/integrationtests/ThemeEditorIntegrationTests.java
+++ b/src/test/java/ninjabrainbot/integrationtests/ThemeEditorIntegrationTests.java
@@ -10,9 +10,11 @@
 import ninjabrainbot.util.TestUtils;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 
 public class ThemeEditorIntegrationTests {
 
+	@DisabledIfEnvironmentVariable(named = "CI", matches = "true")
 	@Test
 	public void canOpenDialog() {
 		// Arrange