diff --git a/src/Tests/CapturePointTest.cpp b/src/Tests/CapturePointTest.cpp
index 2c7bf430..8a9baf40 100644
--- a/src/Tests/CapturePointTest.cpp
+++ b/src/Tests/CapturePointTest.cpp
@@ -94,7 +94,7 @@ CapturePointTest::CapturePointTest(int runTestNumber)
     m_World = new World();
 
     // Create system pipeline
-    m_SystemPipeline = new SystemPipeline(m_World,m_EventBroker);
+    m_SystemPipeline = new SystemPipeline(m_World,m_EventBroker, true, false);
     m_SystemPipeline->AddSystem<HealthSystem>(0);
     m_SystemPipeline->AddSystem<CapturePointSystem>(1);
 
diff --git a/src/Tests/CollisionTest.cpp b/src/Tests/CollisionTest.cpp
index 6cb6c88b..b5ba8245 100644
--- a/src/Tests/CollisionTest.cpp
+++ b/src/Tests/CollisionTest.cpp
@@ -33,10 +33,10 @@ void RayTest(std::string fileName) {
     ResourceManager::RegisterType<RawModel>("RawModel");
     auto unitBox = ResourceManager::Load<RawModel>(fileName);
     BOOST_REQUIRE(unitBox != nullptr);
-    bool hit = Collision::RayVsModel(ray, unitBox->m_Vertices, unitBox->m_Indices);
+    bool hit = Collision::RayVsModel(ray, unitBox->Vertices(), unitBox->m_Indices, glm::mat4(1));
     BOOST_CHECK(hit);
     ray.SetDirection(glm::vec3(-1, 0, 0));
-    hit = Collision::RayVsModel(ray, unitBox->m_Vertices, unitBox->m_Indices);
+    hit = Collision::RayVsModel(ray, unitBox->Vertices(), unitBox->m_Indices, glm::mat4(1));
     BOOST_CHECK(!hit);
 }
 
@@ -146,12 +146,12 @@ BOOST_AUTO_TEST_CASE(rayVsModelTest2)
         z = Collision::RayVsAABB(ray, someAABB);
         if (z) {
             //hit
-            bool hit = Collision::RayVsModel(ray, unitBox->m_Vertices, unitBox->m_Indices);
+            bool hit = Collision::RayVsModel(ray, unitBox->Vertices(), unitBox->m_Indices,glm::mat4(1));
             if (!hit) {
                 //if rayvsaabb hit but rayvvmodel didnt hit, we get to here
-                glm::vec3 outtttttttt;
-                hit = Collision::RayVsModel(ray, unitBox->m_Vertices, unitBox->m_Indices, outtttttttt);
-                hit = Collision::RayVsModel(ray, unitBox->m_Vertices, unitBox->m_Indices);
+                glm::mat4 outtttttttt;
+                hit = Collision::RayVsModel(ray, unitBox->Vertices(), unitBox->m_Indices, glm::mat4(1));
+                hit = Collision::RayVsModel(ray, unitBox->Vertices(), unitBox->m_Indices, glm::mat4(1));
             }
             else {
                 hit = hit;
@@ -163,7 +163,7 @@ BOOST_AUTO_TEST_CASE(rayVsModelTest2)
         //    z = z;
         //}
         //
-        bool hit = Collision::RayVsModel(ray, unitBox->m_Vertices, unitBox->m_Indices);
+        bool hit = Collision::RayVsModel(ray, unitBox->Vertices(), unitBox->m_Indices, glm::mat4(1));
         ////breakpoint test
         //if (!hit) {
         //    hit = hit;
@@ -175,8 +175,8 @@ BOOST_AUTO_TEST_CASE(rayVsModelTest2)
                 //if rayvsmodel hit but rayvsaabb didnt hit then we get to here
                 z = Collision::RayVsAABB(ray, someAABB);
                 glm::vec3 outtttttttt;
-                hit = Collision::RayVsModel(ray, unitBox->m_Vertices, unitBox->m_Indices, outtttttttt);
-                hit = Collision::RayVsModel(ray, unitBox->m_Vertices, unitBox->m_Indices);
+                hit = Collision::RayVsModel(ray, unitBox->Vertices(), unitBox->m_Indices, glm::mat4(1));
+                hit = Collision::RayVsModel(ray, unitBox->Vertices(), unitBox->m_Indices, glm::mat4(1));
             }
             else {
                 z = z;
diff --git a/src/Tests/HealthSystemTest.cpp b/src/Tests/HealthSystemTest.cpp
index 8c084070..bf2650a3 100644
--- a/src/Tests/HealthSystemTest.cpp
+++ b/src/Tests/HealthSystemTest.cpp
@@ -48,7 +48,7 @@ GameHealthSystemTest::GameHealthSystemTest()
     fp.MergeEntities(m_World);
 
     // Create system pipeline
-    m_SystemPipeline = new SystemPipeline(m_World, m_EventBroker);
+    m_SystemPipeline = new SystemPipeline(m_World, m_EventBroker, false, false);
     m_SystemPipeline->AddSystem<HealthSystem>(0);
 
     //The Test
diff --git a/src/Tests/PickupSpawnTest.cpp b/src/Tests/PickupSpawnTest.cpp
index 7cbed85f..4acd897e 100644
--- a/src/Tests/PickupSpawnTest.cpp
+++ b/src/Tests/PickupSpawnTest.cpp
@@ -39,7 +39,7 @@ PickupSpawnTest::PickupSpawnTest(int runTestNumber)
     m_World = new World();
 
     // Create system pipeline
-    m_SystemPipeline = new SystemPipeline(m_World, m_EventBroker);
+    m_SystemPipeline = new SystemPipeline(m_World, m_EventBroker, false, false);
     m_SystemPipeline->AddSystem<HealthSystem>(0);
     m_SystemPipeline->AddSystem<PickupSpawnSystem>(1);