diff --git a/Engine/source/core/util/test/swizzleTest.cpp b/Engine/source/core/util/test/swizzleTest.cpp
new file mode 100644
index 000000000..942150022
--- /dev/null
+++ b/Engine/source/core/util/test/swizzleTest.cpp
@@ -0,0 +1,129 @@
+//-----------------------------------------------------------------------------
+// Copyright (c) 2014 GarageGames, LLC
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+//-----------------------------------------------------------------------------
+
+#ifdef TORQUE_TESTS_ENABLED
+#include "platform/platform.h"
+#include "testing/unitTesting.h"
+#include "core/util/swizzle.h"
+#include "math/mRandom.h"
+
+class TestStruct
+{
+private:
+   static U32 smIdx;
+   U32 mIdx;
+   U32 mData;
+   
+public:
+   TestStruct( const S32 data = -1 ) : mData( data ), mIdx( smIdx++ ) {};
+
+   dsize_t Idx() const { return mIdx; }
+
+   U32 Data() const { return mData; }
+   void Data(U32 val) { mData = val; }
+};
+
+U32 TestStruct::smIdx = 0;
+
+TEST(Swizzle, Swizzle)
+{
+   //------------------------------------------------------------------------
+   // Debugger-Observable Functionality Tests
+   //------------------------------------------------------------------------
+   U8 simpleBuffer[] = { 0, 1, 2, 3 };
+   U8 simpleTest[] = { 0, 1, 2, 3 };
+
+#define RESET_SIMPLE() dMemcpy( simpleTest, simpleBuffer, sizeof( simpleBuffer ) )
+
+   //------------------------------------------------------------------------
+   // No-switch test
+   dsize_t noSwzl4[] = { 0, 1, 2, 3 };
+   Swizzle<U8,4> noSwizzle4( noSwzl4 );
+
+   noSwizzle4.InPlace( simpleTest, sizeof( simpleTest ) );
+   EXPECT_EQ( dMemcmp( simpleTest, simpleBuffer, sizeof( simpleBuffer ) ), 0 )
+      << "No-switch test failed!";
+   RESET_SIMPLE();
+
+   //------------------------------------------------------------------------
+   // No-brainer RGBA->BGRA test
+   dsize_t bgraSwzl[] = { 2, 1, 0, 3 };
+   Swizzle<U8,4> bgraSwizzle( bgraSwzl );
+
+   U8 bgraTest[] = { 2, 1, 0, 3 };
+   bgraSwizzle.InPlace( simpleTest, sizeof( simpleTest ) );
+   EXPECT_EQ( dMemcmp( simpleTest, bgraTest, sizeof( bgraTest ) ), 0 )
+      << "U8 RGBA->BGRA test failed";
+      
+   //------------------------------------------------------------------------
+   // Reverse test
+   bgraSwizzle.InPlace( simpleTest, sizeof( simpleTest ) );
+   EXPECT_EQ( dMemcmp( simpleTest, simpleBuffer, sizeof( simpleBuffer ) ), 0 )
+      << "U8 RGBA->BGRA reverse test failed";
+
+   RESET_SIMPLE();
+
+   //------------------------------------------------------------------------
+   // Object support test
+   Swizzle<TestStruct,4> bgraObjSwizzle( bgraSwzl );
+   {
+      U32 objIdx[] = { 0, 1, 2, 3 };
+
+      FrameTemp<TestStruct> objTest( sizeof( objIdx ) / sizeof( U32 ) );
+      FrameTemp<U32> randData( sizeof( objIdx ) / sizeof( U32 ) );
+
+      bool same = true;
+
+      for( U32 i = 0; i < sizeof( objIdx ) / sizeof( U32 ); i++ )
+      {
+         // Make random data and assign it
+         randData[i] = gRandGen.randI();
+         objTest[i].Data( randData[i] );
+
+         // Continue object sanity check
+         same &= ( objTest[i].Idx() == objIdx[i] );
+      }
+
+      EXPECT_TRUE( same )
+         << "Test object failed to be competent";
+
+      bgraObjSwizzle.InPlace( ~objTest, sizeof( TestStruct ) * ( sizeof( objIdx ) / sizeof( U32 ) ) );
+      same = true;
+
+      for( U32 i = 0; i < sizeof( objIdx ) / sizeof( U32 ); i++ )
+         same &= ( objTest[i].Idx() == bgraTest[i] ) && ( objTest[i].Data() == randData[ (U32)bgraTest[ i ] ] );
+
+      EXPECT_TRUE( same )
+         << "Object RGBA->BGRA test failed.";
+
+      bgraObjSwizzle.InPlace( ~objTest, sizeof( TestStruct ) * ( sizeof( objIdx ) / sizeof( U32 ) ) );
+      same = true;
+
+      for( U32 i = 0; i < sizeof( objIdx ) / sizeof( U32 ); i++ )
+         same &= ( objTest[i].Idx() == objIdx[i] ) && ( objTest[i].Data() == randData[i] );
+
+      EXPECT_TRUE( same )
+         << "Object RGBA->BGRA reverse test failed.";
+   }
+};
+
+#endif
\ No newline at end of file
diff --git a/Engine/source/unit/tests/testSwizzle.cpp b/Engine/source/unit/tests/testSwizzle.cpp
deleted file mode 100644
index 1c90394ec..000000000
--- a/Engine/source/unit/tests/testSwizzle.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2012 GarageGames, LLC
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to
-// deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-// IN THE SOFTWARE.
-//-----------------------------------------------------------------------------
-
-#include "platform/platform.h"
-#include "unit/test.h"
-#include "unit/memoryTester.h"
-#include "core/util/swizzle.h"
-#include "math/mRandom.h"
-
-using namespace UnitTesting;
-
-class TestStruct
-{
-private:
-   static U32 smIdx;
-   U32 mIdx;
-   U32 mData;
-   
-public:
-   TestStruct( const S32 data = -1 ) : mData( data ), mIdx( smIdx++ ) {};
-
-   dsize_t Idx() const { return mIdx; }
-
-   U32 Data() const { return mData; }
-   void Data(U32 val) { mData = val; }
-};
-
-U32 TestStruct::smIdx = 0;
-
-CreateUnitTest(TestSwizzle, "Utils/Swizzle")
-{
-   void run()
-   {
-      //------------------------------------------------------------------------
-      // Debugger-Observable Functionality Tests
-      //------------------------------------------------------------------------
-      U8 simpleBuffer[] = { 0, 1, 2, 3 };
-      U8 simpleTest[] = { 0, 1, 2, 3 };
-
-#define RESET_SIMPLE() dMemcpy( simpleTest, simpleBuffer, sizeof( simpleBuffer ) )
-
-      //------------------------------------------------------------------------
-      // No-switch test
-      dsize_t noSwzl4[] = { 0, 1, 2, 3 };
-      Swizzle<U8,4> noSwizzle4( noSwzl4 );
-
-      noSwizzle4.InPlace( simpleTest, sizeof( simpleTest ) );
-      test( dMemcmp( simpleTest, simpleBuffer, sizeof( simpleBuffer ) ) == 0, "No-switch test failed!" );
-      RESET_SIMPLE();
-
-      //------------------------------------------------------------------------
-      // No-brainer RGBA->BGRA test
-      dsize_t bgraSwzl[] = { 2, 1, 0, 3 };
-      Swizzle<U8,4> bgraSwizzle( bgraSwzl );
-
-      U8 bgraTest[] = { 2, 1, 0, 3 };
-      bgraSwizzle.InPlace( simpleTest, sizeof( simpleTest ) );
-      test( dMemcmp( simpleTest, bgraTest, sizeof( bgraTest ) ) == 0, "U8 RGBA->BGRA test failed" );
-      
-      //------------------------------------------------------------------------
-      // Reverse test
-      bgraSwizzle.InPlace( simpleTest, sizeof( simpleTest ) );
-      test( dMemcmp( simpleTest, simpleBuffer, sizeof( simpleBuffer ) ) == 0, "U8 RGBA->BGRA reverse test failed" );
-
-      RESET_SIMPLE();
-
-      //------------------------------------------------------------------------
-      // Object support test
-      Swizzle<TestStruct,4> bgraObjSwizzle( bgraSwzl );
-      {
-         U32 objIdx[] = { 0, 1, 2, 3 };
-
-         FrameTemp<TestStruct> objTest( sizeof( objIdx ) / sizeof( U32 ) );
-         FrameTemp<U32> randData( sizeof( objIdx ) / sizeof( U32 ) );
-
-         bool same = true;
-
-         for( U32 i = 0; i < sizeof( objIdx ) / sizeof( U32 ); i++ )
-         {
-            // Make random data and assign it
-            randData[i] = gRandGen.randI();
-            objTest[i].Data( randData[i] );
-
-            // Continue object sanity check
-            same &= ( objTest[i].Idx() == objIdx[i] );
-         }
-
-         test( same, "Test object failed to be competent" );
-
-         bgraObjSwizzle.InPlace( ~objTest, sizeof( TestStruct ) * ( sizeof( objIdx ) / sizeof( U32 ) ) );
-         same = true;
-
-         for( U32 i = 0; i < sizeof( objIdx ) / sizeof( U32 ); i++ )
-            same &= ( objTest[i].Idx() == bgraTest[i] ) && ( objTest[i].Data() == randData[ (U32)bgraTest[ i ] ] );
-
-         test( same, "Object RGBA->BGRA test failed." );
-
-         bgraObjSwizzle.InPlace( ~objTest, sizeof( TestStruct ) * ( sizeof( objIdx ) / sizeof( U32 ) ) );
-         same = true;
-
-         for( U32 i = 0; i < sizeof( objIdx ) / sizeof( U32 ); i++ )
-            same &= ( objTest[i].Idx() == objIdx[i] ) && ( objTest[i].Data() == randData[i] );
-
-         test( same, "Object RGBA->BGRA reverse test failed." );
-      }
-   }
-};
\ No newline at end of file