diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f25060c0a0ccdd77d361f71cffaeeb85e993991b
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,19 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <option name="RIGHT_MARGIN" value="100" />
+    <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
+    <Objective-C-extensions>
+      <extensions>
+        <pair source="cpp" header="hpp" fileNamingConvention="PASCAL_CASE" />
+        <pair source="c" header="h" fileNamingConvention="NONE" />
+      </extensions>
+    </Objective-C-extensions>
+    <codeStyleSettings language="ObjectiveC">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="USE_TAB_CHARACTER" value="true" />
+        <option name="SMART_TABS" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/src/ErrorHandler.cpp b/src/ErrorHandler.cpp
index f30b10bd62d9a62ad8b5d4b5b0bfed9f1d47aedc..d62eadd5025efb6ecbaa252def3a664ef1a8f55b 100644
--- a/src/ErrorHandler.cpp
+++ b/src/ErrorHandler.cpp
@@ -42,6 +42,10 @@ void ErrorHandler::reportError(const Message &message, RoutingErrorType errorCod
 	logError(message, errorCode);
 }
 
+void ErrorHandler::reportInternalError(ErrorHandler::InternalErrorType errorCode) {
+	logError(UnknownInternalError);
+}
+
 template<typename ErrorType>
 void ErrorHandler::logError(const Message &message, ErrorType errorType) {
 	std::cerr
diff --git a/test/Services/ServiceTests.hpp b/test/Services/ServiceTests.hpp
index f196bac9b14595adf2536fafb73fab8fbcb09068..a160558a0aac56d215ae6af329ce7b690c0b2f4d 100644
--- a/test/Services/ServiceTests.hpp
+++ b/test/Services/ServiceTests.hpp
@@ -3,7 +3,6 @@
 
 #include <vector>
 #include <Message.hpp>
-#include <ErrorHandler.hpp>
 
 /**
  * Supporting class for tests against ECSS services
@@ -12,7 +11,6 @@
  */
 class ServiceTests {
 	static std::vector<Message> queuedMessages;
-	static std::vector<ErrorHandler::InternalErrorType> internalErrors;
 
 public:
 	/**
@@ -23,15 +21,6 @@ public:
 		return queuedMessages.at(number);
 	}
 
-	/**
-	 * Get an error from the list of logged errors
-	 * @param number The number of the error, starting from 0 in chronological order
-	 */
-	static ErrorHandler::InternalErrorType &getError(uint64_t number) { // uint32 just for
-		// overloading
-		return internalErrors.at(number);
-	}
-
 	/**
 	 * Add a message to the queue of messages to be sent
 	 */
@@ -39,13 +28,6 @@ public:
 		queuedMessages.push_back(message);
 	}
 
-	/**
-	 * Add an error to the queue of logged errors
-	 */
-	static void storeError(const ErrorHandler::InternalErrorType &error) {
-		internalErrors.push_back(error);
-	}
-
 	/**
 	 * Counts the number of messages in the queue
 	 */
@@ -61,11 +43,10 @@ public:
 	}
 
 	/**
-	 * Remove all the queued messages and errors from the lists, starting over from 0 items again
+	 * Remove all the queued messages from the list, starting over from 0 items again
 	 */
 	static void reset() {
 		queuedMessages.clear();
-		internalErrors.clear();
 	}
 };