diff --git a/TrooperEngineDLL/TrooperEngine/UtilityEngine/cUtility.hpp b/TrooperEngineDLL/TrooperEngine/UtilityEngine/cUtility.hpp
index b5c035a..b6e9258 100644
--- a/TrooperEngineDLL/TrooperEngine/UtilityEngine/cUtility.hpp
+++ b/TrooperEngineDLL/TrooperEngine/UtilityEngine/cUtility.hpp
@@ -20,8 +20,6 @@
 
 using UtilityEngine::cString;
 
-
-
 namespace UtilityEngine {
 	/* Singleton */
 	class EXPORT_FROM_MYDLL cUtility
@@ -51,17 +49,14 @@ namespace UtilityEngine {
 		void Message( const cString& msg, const cString& funcName = "", const eTypeSDL typeSDL = eTypeSDL::NONE ) const;
 
 		void PrintVersion( const eTypeSDL typeSDL = eTypeSDL::ALL ) const;
-
-		
+				
 	private:	
 		///Functions
 		void VersionParser( const cString& runCompiled, const SDL_version& version, const cString& type ) const;
-
 		
 	private:
 		///Variables
 		static cUtility* sp_inst;// = nullptr
-
 	};/// END CLASS DEFINITION cUtility
 }/// END NAMESPACE DEFINITION UtilityEngine
 #endif/// END IFNDEF _CUTILITY_HPP_
\ No newline at end of file
diff --git a/TrooperEngineDLL/TrooperEngine/VideoEngine/cVideo.cpp b/TrooperEngineDLL/TrooperEngine/VideoEngine/cVideo.cpp
index 1a21d06..e82916b 100644
--- a/TrooperEngineDLL/TrooperEngine/VideoEngine/cVideo.cpp
+++ b/TrooperEngineDLL/TrooperEngine/VideoEngine/cVideo.cpp
@@ -77,7 +77,8 @@ const bool cVideo::Setup()
 
 void cVideo::CleanUp()
 {
-	SDL_DestroyWindow(mp_window);
+	if (mp_window != nullptr)
+		SDL_DestroyWindow(mp_window);
 	mp_window = nullptr;
 }
 
diff --git a/TrooperEngineTest/TrooperEngineTest.vcxproj b/TrooperEngineTest/TrooperEngineTest.vcxproj
index 6e3fd56..0a00d3c 100644
--- a/TrooperEngineTest/TrooperEngineTest.vcxproj
+++ b/TrooperEngineTest/TrooperEngineTest.vcxproj
@@ -150,12 +150,16 @@
     <ClCompile Include="main.cpp" />
     <ClCompile Include="UTest\UTest.cpp" />
     <ClCompile Include="UtilityEngineTest\StringTest.cpp" />
+    <ClCompile Include="VideoEngineTest\RendererTest.cpp" />
+    <ClCompile Include="VideoEngineTest\VideoTest.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="EventEngineTest\EventEngineTest.hpp" />
     <ClInclude Include="GUIEngineTest\GUIXMLTest.hpp" />
     <ClInclude Include="UTest\UTest.hpp" />
     <ClInclude Include="UtilityEngineTest\StringTest.hpp" />
+    <ClInclude Include="VideoEngineTest\RendererTest.hpp" />
+    <ClInclude Include="VideoEngineTest\VideoTest.hpp" />
   </ItemGroup>
   <ItemGroup>
     <Xml Include="xml\GUI.xml" />
diff --git a/TrooperEngineTest/TrooperEngineTest.vcxproj.filters b/TrooperEngineTest/TrooperEngineTest.vcxproj.filters
index a9f1b01..07b34e7 100644
--- a/TrooperEngineTest/TrooperEngineTest.vcxproj.filters
+++ b/TrooperEngineTest/TrooperEngineTest.vcxproj.filters
@@ -33,6 +33,12 @@
     <ClInclude Include="EventEngineTest\EventEngineTest.hpp">
       <Filter>EventEngineTest</Filter>
     </ClInclude>
+    <ClInclude Include="VideoEngineTest\RendererTest.hpp">
+      <Filter>VideoEngineTest</Filter>
+    </ClInclude>
+    <ClInclude Include="VideoEngineTest\VideoTest.hpp">
+      <Filter>VideoEngineTest</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="UTest\UTest.cpp">
@@ -48,6 +54,12 @@
     <ClCompile Include="EventEngineTest\EventEngineTest.cpp">
       <Filter>EventEngineTest</Filter>
     </ClCompile>
+    <ClCompile Include="VideoEngineTest\RendererTest.cpp">
+      <Filter>VideoEngineTest</Filter>
+    </ClCompile>
+    <ClCompile Include="VideoEngineTest\VideoTest.cpp">
+      <Filter>VideoEngineTest</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Xml Include="xml\GUI.xml">
diff --git a/TrooperEngineTest/VideoEngineTest/RendererTest.cpp b/TrooperEngineTest/VideoEngineTest/RendererTest.cpp
new file mode 100644
index 0000000..9a2e26e
--- /dev/null
+++ b/TrooperEngineTest/VideoEngineTest/RendererTest.cpp
@@ -0,0 +1,21 @@
+#include "RendererTest.hpp"
+
+#include "../UTest/UTest.hpp"
+
+/*** TrooperEngine DLL Header Files ***/
+#include "TrooperEngine.hpp"
+
+using VideoEngine::cRenderer;
+
+void RendererTest()
+{
+	// cRenderer
+	printf("\nTesting cRenderer -----\n\n");
+
+	UTest u("cRenderer");
+
+	SDL_Surface* sur = nullptr;
+	//cRenderer::Inst()->TextureToSurface();
+
+	u.report();
+}
\ No newline at end of file
diff --git a/TrooperEngineTest/VideoEngineTest/RendererTest.hpp b/TrooperEngineTest/VideoEngineTest/RendererTest.hpp
new file mode 100644
index 0000000..546b46c
--- /dev/null
+++ b/TrooperEngineTest/VideoEngineTest/RendererTest.hpp
@@ -0,0 +1,6 @@
+#ifndef __RENDERERTEST__
+#define __RENDERERTEST__
+
+void RendererTest();
+
+#endif // __RENDERERTEST__
\ No newline at end of file
diff --git a/TrooperEngineTest/VideoEngineTest/VideoTest.cpp b/TrooperEngineTest/VideoEngineTest/VideoTest.cpp
new file mode 100644
index 0000000..9151f27
--- /dev/null
+++ b/TrooperEngineTest/VideoEngineTest/VideoTest.cpp
@@ -0,0 +1,33 @@
+#include "VideoTest.hpp"
+
+#include "../UTest/UTest.hpp"
+
+/*** TrooperEngine DLL Header Files ***/
+#include "TrooperEngine.hpp"
+
+using VideoEngine::cVideo;
+
+void VideoTest()
+{
+	// cVideo
+	printf("\nTesting cVideo -----\n\n");
+
+	UTest u("cVideo");
+
+	TrooperEngineCore::cTrooperEngineCore::Inst();
+	VideoEngine::cVideo& video = VideoEngine::cVideo::Inst();
+	video.Initialize();
+
+	u.test("Video Initialize", video.IsInit());
+
+	u.test("Video Setup", video.Setup());
+
+	//	CaptionTest
+	cString cap_set = "Hello World";
+	cVideo::Inst().setCaption(cap_set);
+	cString cap_get = cVideo::Inst().getCaption();
+	u.test("setCaption() and getCaption()", (cap_get == cap_set));
+
+
+	u.report();
+}
\ No newline at end of file
diff --git a/TrooperEngineTest/VideoEngineTest/VideoTest.hpp b/TrooperEngineTest/VideoEngineTest/VideoTest.hpp
new file mode 100644
index 0000000..b8102fc
--- /dev/null
+++ b/TrooperEngineTest/VideoEngineTest/VideoTest.hpp
@@ -0,0 +1,6 @@
+#ifndef __VIDEOTEST__
+#define __VIDEOTEST__
+
+void VideoTest();
+
+#endif // __VIDEOTEST__
\ No newline at end of file
diff --git a/TrooperEngineTest/main.cpp b/TrooperEngineTest/main.cpp
index 4252ffd..05cdba1 100644
--- a/TrooperEngineTest/main.cpp
+++ b/TrooperEngineTest/main.cpp
@@ -21,7 +21,13 @@ see license.txt for details
 
 #include "UTest/UTest.hpp"
 
+/*** Video Engine Test ***/
+#include "VideoEngineTest/VideoTest.hpp"
+
+/*** Utility Engine Test ***/
 #include "UtilityEngineTest/StringTest.hpp"
+
+/*** GUI Engine Test ***/
 #include "GUIEngineTest/GUIXMLTest.hpp"
 
 using UtilityEngine::cString;
@@ -37,22 +43,10 @@ int main(int argc, char *argv[])
 
 	printf(cString("TrooperEngine V") + TrooperEngineCore::cTrooperEngineCore::Version() + "\n");
 
+	
+	VideoTest();
 
-	UTest u("cVideo");
-
-	printf("\nTesting cVideo\n");
-
-	TrooperEngineCore::cTrooperEngineCore::Inst();
-	VideoEngine::cVideo& video = VideoEngine::cVideo::Inst();
-	video.Initialize();
-	//core.VideoInit();
-
-	if (!video.Setup()) {
-		printf("database failed to open.\n");
-		return 1;
-	}
-
-	u.test("Video Initialize open", video.IsInit());
+	
 
 	StringTest();
 
diff --git a/TrooperEngineTest/test.bmp b/TrooperEngineTest/test.bmp
index 293cca5..24b92ea 100644
Binary files a/TrooperEngineTest/test.bmp and b/TrooperEngineTest/test.bmp differ