diff --git a/Intel8080/test/Configuration.cpp b/Intel8080/test/Configuration.cpp
deleted file mode 100644
index 77ae143..0000000
--- a/Intel8080/test/Configuration.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "stdafx.h"
-#include "Configuration.h"
-
-Configuration::Configuration()
-:	m_debugMode(false),
-	m_profileMode(false),
-	m_romDirectory("roms") {
-}
diff --git a/Intel8080/test/Configuration.h b/Intel8080/test/Configuration.h
index 64a76ae..900f2f5 100644
--- a/Intel8080/test/Configuration.h
+++ b/Intel8080/test/Configuration.h
@@ -6,7 +6,7 @@
 
 class Configuration {
 public:
-	Configuration();
+	Configuration() = default;
 
 	bool isDebugMode() const {
 		return m_debugMode;
@@ -33,8 +33,7 @@ public:
 	}
 
 private:
-	bool m_debugMode;
-	bool m_profileMode;
-
-	std::string m_romDirectory;
+	bool m_debugMode = false;
+	bool m_profileMode = false;
+	std::string m_romDirectory = "roms";
 };
diff --git a/Intel8080/test/test_Intel8080.vcxproj b/Intel8080/test/test_Intel8080.vcxproj
index 69cfc0c..bfcf226 100644
--- a/Intel8080/test/test_Intel8080.vcxproj
+++ b/Intel8080/test/test_Intel8080.vcxproj
@@ -150,7 +150,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Board.cpp" />
-    <ClCompile Include="Configuration.cpp" />
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
diff --git a/Intel8080/test/test_Intel8080.vcxproj.filters b/Intel8080/test/test_Intel8080.vcxproj.filters
index d2c0cf0..3f06f17 100644
--- a/Intel8080/test/test_Intel8080.vcxproj.filters
+++ b/Intel8080/test/test_Intel8080.vcxproj.filters
@@ -28,9 +28,6 @@
     <ClCompile Include="Board.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Configuration.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="test.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>