diff --git a/src/Tests/HealthSystemTest.h b/src/Tests/HealthSystemTest.h
index 2890dfc1..bd3f3de7 100644
--- a/src/Tests/HealthSystemTest.h
+++ b/src/Tests/HealthSystemTest.h
@@ -8,7 +8,6 @@
 #include "Core/InputManager.h"
 #include "GUI/Frame.h"
 #include "Core/World.h"
-#include "Rendering/RenderQueueFactory.h"
 #include "Input/InputProxy.h"
 #include "Input/KeyboardInputHandler.h"
 #include "Input/MouseInputHandler.h"
diff --git a/src/Tests/OctTreeTestAnders.cpp b/src/Tests/OctTreeTestAnders.cpp
deleted file mode 100644
index 477ccbf4..00000000
--- a/src/Tests/OctTreeTestAnders.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#include <boost/test/unit_test.hpp>
-using boost::unit_test_framework::test_suite;
-using boost::unit_test_framework::test_case;
-#include <stdlib.h>//srand
-
-//#define private public//HACK! Needed for white box testing
-//#include "Engine/Core/OctTree.h"
-//#include "OldOctTree.h"
-//friend class and refactoringIntoNewClass is some extra work and needs to be updated when the original class is updated, and can contain bugs that
-//isnt in the original class
-//Reflection-inspection seems to be only available for C#
-//http://stackoverflow.com/questions/6778496/how-to-do-unit-testing-on-private-members-and-methods-of-c-classes
-//http://stackoverflow.com/questions/3676664/unit-testing-of-private-methods
-
-#include "OctTreeTestGameClass.h"
-
-#define private public//HACK! Needed for white box testing
-#include "Engine/Core/OctTree.h"
-//else we would have to "open up" the octTree class more with get/sets, public methods, etc. which is not good encapsulation-wise
-
-BOOST_AUTO_TEST_SUITE(octTreeTestsA)
-
-BOOST_AUTO_TEST_CASE(octTreeTest)
-{
-    //white box testing
-    //http://softwaretestingfundamentals.com/differences-between-black-box-testing-and-white-box-testing/
-    //http://technologyconversations.com/2013/12/11/black-box-vs-white-box-testing/
-
-    //simple AABB constructor check
-    auto minCorner = glm::vec3(0.0f, 0.0f, 0.0f);
-    auto maxCorner = glm::vec3(1.0f, 1.0f, 1.0f);
-    auto someAABB = AABB(minCorner, maxCorner);
-    BOOST_CHECK(someAABB.MinCorner() == minCorner);
-    BOOST_CHECK(someAABB.MaxCorner() == maxCorner);
-    BOOST_CHECK(someAABB.Center() == 0.5f * (minCorner + maxCorner));
-
-    //simple destructor check in the end, just look for memleaks, then it didnt clear the AABB structure
-}
-
-BOOST_AUTO_TEST_CASE(octTreeTest2)
-{
-    //octtree draw etc
-    Game game(0, nullptr);
-    while (game.Running()) {
-        game.Tick();
-    }
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/Tests/OctTreeTestGameClass.cpp b/src/Tests/OctTreeTestGameClass.cpp
deleted file mode 100644
index 0f195cec..00000000
--- a/src/Tests/OctTreeTestGameClass.cpp
+++ /dev/null
@@ -1,193 +0,0 @@
-#include "OctTreeTestGameClass.h"
-
-Game::Game(int argc, char* argv[]) : someOctTree(AABB(-0.5f*worldSize, 0.5f*worldSize), 2)
-{
-    ResourceManager::RegisterType<ConfigFile>("ConfigFile");
-    ResourceManager::RegisterType<Model>("Model");
-    ResourceManager::RegisterType<Texture>("Texture");
-    ResourceManager::RegisterType<EntityFile>("EntityFile");
-    ResourceManager::RegisterType<ShaderProgram>("ShaderProgram");
-
-    m_Config = ResourceManager::Load<ConfigFile>("Config.ini");
-    LOG_LEVEL = static_cast<_LOG_LEVEL>(m_Config->Get<int>("Debug.LogLevel", 1));
-
-    // Create the core event broker
-    m_EventBroker = new EventBroker();
-
-    m_RenderQueueFactory = new RenderQueueFactory();
-
-    // Create the renderer
-    m_Renderer = new Renderer(m_EventBroker);
-    m_Renderer->SetFullscreen(m_Config->Get<bool>("Video.Fullscreen", false));
-    m_Renderer->SetVSYNC(m_Config->Get<bool>("Video.VSYNC", false));
-    m_Renderer->SetResolution(Rectangle(
-        0,
-        0,
-        m_Config->Get<int>("Video.Width", 1280),
-        m_Config->Get<int>("Video.Height", 720)
-        ));
-    m_Renderer->Initialize();
-    m_Renderer->Camera()->SetFOV(glm::radians(m_Config->Get<float>("Video.FOV", 90.f)));
-
-    // Create input manager
-    m_InputManager = new InputManager(m_Renderer->Window(), m_EventBroker);
-    m_InputProxy = new InputProxy(m_EventBroker);
-    m_InputProxy->AddHandler<KeyboardInputHandler>();
-    m_InputProxy->AddHandler<MouseInputHandler>();
-    m_InputProxy->LoadBindings("Input.ini");
-
-    // Create the root level GUI frame
-    m_FrameStack = new GUI::Frame(m_EventBroker);
-    m_FrameStack->Width = m_Renderer->Resolution().Width;
-    m_FrameStack->Height = m_Renderer->Resolution().Height;
-
-    // Create a TEST WORLD
-    m_World = new HardcodedTestWorld();
-
-    m_SystemPipeline = new SystemPipeline(m_EventBroker);
-    m_SystemPipeline->AddSystem<PlayerSystem>(0);
-
-    m_LastTime = glfwGetTime();
-}
-
-Game::~Game()
-{
-    delete m_FrameStack;
-    delete m_EventBroker;
-}
-
-void Game::Tick()
-{
-    double currentTime = glfwGetTime();
-    double dt = currentTime - m_LastTime;
-    m_LastTime = currentTime;
-
-    // Handle input in a weird looking but responsive way
-    m_EventBroker->Process<InputManager>();
-    m_EventBroker->Swap();
-    m_InputManager->Update(dt);
-    m_EventBroker->Swap();
-    m_InputProxy->Update(dt);
-    m_EventBroker->Swap();
-    m_InputProxy->Process();
-    m_EventBroker->Swap();
-
-#define TEST1
-    //this draws the octTree and you can set the cube inside it and see what boxes in the tree that it belongs to
-#ifdef TEST1
-    if (!m_UpdatedOnce) {
-        m_UpdatedOnce = true;
-        m_World->createTestEntitiesTest1();
-    }
-
-    //add/move the trigger box
-    auto pos = m_Renderer->Camera()->Forward() + m_Renderer->Camera()->Position();
-    AABB boxi;
-    boxi.CreateFromCenter(pos, maxPos - minPos);
-    frameCounter++;
-    if (frameCounter > 1) {
-        m_World->someOctTree.ClearDynamicObjects();
-        m_World->someOctTree.AddDynamicObject(boxi);
-        frameCounter = 0;
-    }
-    ComponentWrapper transform = m_World->GetComponent(m_World->anotherBoxTransformId, "Transform");
-    transform["Position"] = boxi.Center();
-
-    //check all children again in the tree if they have a box in them or not, and colormark them if they do
-    //contentboxarna får man ut - inte childboxarna!
-    std::vector<int> boxIndex;
-    boxIndex = m_World->someOctTree.m_Root->childIndicesContainingBox(boxi);
-
-    for (auto& oneLinkedObject : m_World->linkOM)
-    {
-        ComponentWrapper model = m_World->GetComponent(oneLinkedObject.entId, "Model");
-        model["Color"] = glm::vec4(1.0f, 1.0f, 1.0f, 1.0f);
-        if (oneLinkedObject.child->m_DynamicObjIndices.size() != 0) {
-            model["Color"] = glm::vec4(0.0f, 0.0f, 0.0f, 1.0f);
-        }
-
-        //next check if the childIndicesContainingBox method returns the correct boxes
-        //REQUIRED: childIndicesContainingBox must be public to test this!
-        for each (auto someBoxIndex in boxIndex)
-        {
-            glm::vec3 pos = m_World->someOctTree.m_Root->m_Children[someBoxIndex]->m_Box.Center();
-            if (abs(pos.x - oneLinkedObject.posxyz.x) < 0.005f &&
-                abs(pos.y - oneLinkedObject.posxyz.y) < 0.005f &&
-                abs(pos.z - oneLinkedObject.posxyz.z) < 0.005f) {
-                model["Color"] = glm::vec4(0.0f, 1.0f, 0.0f, 1.0f);
-
-            }
-        }
-    }
-    m_RenderQueueFactory->Update(m_World);
-
-    //wireframe
-    glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
-#endif
-    //this tests AABB vs AABB collision and AABB vs OctTree with AABB in it
-#ifdef TEST2
-
-    //only add 1 for now...
-    //grey box
-
-    const glm::vec4 redCol = glm::vec4(1, 0.2f, 0, 1);
-    const glm::vec4 greenCol = glm::vec4(0.1f, 1.0f, 0.25f, 1);
-    const glm::vec3 boxSize = 0.1f*glm::vec3(1.0f, 1.0f, 1.0f);
-    AABB aabb;
-    aabb.CreateFromCenter(glm::vec3(0, 2.0f, 0.0f), glm::vec3(1.0f, 1.0f, 1.0f));
-
-    if (m_UpdatedOnce) {
-        //auto test = someOctTree.childIndicesContainingBox(aabb);
-        std::vector<AABB> test2;
-        someOctTree.BoxesInSameRegion(aabb, test2);
-    }
-    if (!m_UpdatedOnce) {
-        m_UpdatedOnce = true;
-        someOctTree.AddStaticObject(aabb);
-        //create the "small red box"
-        m_BoxID = m_World->CreateEntity();
-        ComponentWrapper transform = m_World->AttachComponent(m_BoxID, "Transform");
-        transform["Scale"] = boxSize;
-        ComponentWrapper model = m_World->AttachComponent(m_BoxID, "Model");
-        model["Resource"] = "Models/Core/UnitBox.obj";
-        m_World->createTestEntitiesTest2();
-    }
-
-    //red box
-    AABB redBox;
-    auto boxPos = m_Renderer->Camera()->Position() + 1.2f*m_Renderer->Camera()->Forward();
-    redBox.CreateFromCenter(boxPos, boxSize);
-    ComponentWrapper transform = m_World->GetComponent(m_BoxID, "Transform");
-    transform["Position"] = boxPos;
-    ComponentWrapper model = m_World->GetComponent(m_BoxID, "Model");
-    //this checks AABB vs an AABB in the octTree
-    if (someOctTree.BoxCollides(redBox, AABB())) {
-        //this checks AABB vs AABB
-        //if (Collision::AABBVsAABB(redBox, aabb)) {
-        //m_Renderer->Camera()->SetPosition(m_PrevPos);
-        //m_Renderer->Camera()->SetOrientation(m_PrevOri);
-        model["Color"] = greenCol;
-    }
-    else {
-        model["Color"] = redCol;
-    }
-
-    m_PrevPos = m_Renderer->Camera()->Position();
-    m_PrevOri = m_Renderer->Camera()->Orientation();
-
-    m_RenderQueueFactory->Update(m_World);
-#endif
-
-    // Iterate through systems and update world!
-    m_SystemPipeline->Update(m_World, dt);
-    m_Renderer->Update(dt);
-
-    m_RenderQueueFactory->Update(m_World);
-    GLERROR("Game::Tick m_RenderQueueFactory->Update");
-    m_Renderer->Draw(m_RenderQueueFactory->RenderQueues());
-    GLERROR("Game::Tick m_Renderer->Draw");
-    m_EventBroker->Swap();
-    m_EventBroker->Clear();
-
-    glfwPollEvents();
-}
diff --git a/src/Tests/OctTreeTestGameClass.h b/src/Tests/OctTreeTestGameClass.h
deleted file mode 100644
index c36707c8..00000000
--- a/src/Tests/OctTreeTestGameClass.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef Game_h__
-#define Game_h__
-
-#include "Core/ResourceManager.h"
-#include "Core/ConfigFile.h"
-#include "Core/EventBroker.h"
-#include "Rendering/Renderer.h"
-#include "Core/InputManager.h"
-#include "GUI/Frame.h"
-#include "Core/World.h"
-#include "Rendering/RenderQueueFactory.h"
-#include "Input/InputProxy.h"
-#include "Input/KeyboardInputHandler.h"
-#include "Input/MouseInputHandler.h"
-#include "Core/EKeyDown.h"
-#include "Core/EntityFile.h"
-#include "Core/SystemPipeline.h"
-#include "RaptorCopterSystem.h"
-#include "PlayerSystem.h"
-#include "Editor/EditorSystem.h"
-
-#include "OctTreeTestHardCodedTestWorld.h"
-#include "Collision/Collision.h"
-
-class Game
-{
-public:
-    Game(int argc, char* argv[]);
-    ~Game();
-
-    bool Running() const { return !glfwWindowShouldClose(m_Renderer->Window()); }
-    void Tick();
-
-private:
-    double m_LastTime;
-    ConfigFile* m_Config = nullptr;
-    EventBroker* m_EventBroker;
-    IRenderer* m_Renderer;
-    InputManager* m_InputManager;
-    GUI::Frame* m_FrameStack;
-    HardcodedTestWorld* m_World;
-    RenderQueueFactory* m_RenderQueueFactory;
-    InputProxy* m_InputProxy;
-    SystemPipeline* m_SystemPipeline;
-
-    //Test1
-    int frameCounter = 0;
-    glm::vec3 minPos = glm::vec3(0.1f, 0.1f, 0.1f);
-    glm::vec3 maxPos = glm::vec3(0.2f, 0.2f, 0.2f);
-
-    //Test2
-    bool m_UpdatedOnce = false;
-    unsigned int m_BoxID;
-    glm::vec3 m_PrevPos;
-    glm::quat m_PrevOri;
-
-    glm::vec3 worldSize = glm::vec3(50, 50, 50);
-    OctTree someOctTree;
-
-};
-
-#endif
diff --git a/src/Tests/OctTreeTestGameMain.cpp b/src/Tests/OctTreeTestGameMain.cpp
deleted file mode 100644
index 43789cea..00000000
--- a/src/Tests/OctTreeTestGameMain.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-//#define BOOST_TEST_MODULE collTest
-#include <boost/test/unit_test.hpp>
-#include <boost/test/execution_monitor.hpp>
-using boost::unit_test_framework::test_suite;
-using boost::unit_test_framework::test_case;
-#include "Engine/Collision/Collision.h"
-#include "Engine/Core/AABB.h"
-#include "Engine/Core/Ray.h"
-#include <stdlib.h>//srand
-#include "Engine/Core/OctTree.h"
-
-//vs memleaks
-//#define _CRTDBG_MAP_ALLOC
-//#include <stdlib.h>
-//#include <crtdbg.h>
-//#define DEBUG_CLIENTBLOCK new( _CLIENT_BLOCK, __FILE__, __LINE__)
-//#define new DEBUG_CLIENTBLOCK
-
-BOOST_AUTO_TEST_SUITE(cTest)
-BOOST_AUTO_TEST_SUITE_END()
-
diff --git a/src/Tests/OctTreeTestHardCodedTestWorld.h b/src/Tests/OctTreeTestHardCodedTestWorld.h
deleted file mode 100644
index 6f68eba6..00000000
--- a/src/Tests/OctTreeTestHardCodedTestWorld.h
+++ /dev/null
@@ -1,134 +0,0 @@
-#include <list>
-#include <tuple>
-#include <boost/any.hpp>
-#include "GLM.h"
-#include "Core/World.h"
-#include "Core/Util/Any.h"
-
-#include <vector>
-//last!
-//#include "OldOctTree.h"
-#define private public
-#include <Engine/Core/OctTree.h>
-
-class HardcodedTestWorld : public World
-{
-public:
-    struct LinkOctTreeAndModel {
-        EntityID entId;
-        OctTree::OctChild* child;
-        glm::vec3 posxyz;
-        LinkOctTreeAndModel(EntityID eId, OctTree::OctChild* ch, glm::vec3 pos)
-        {
-            entId = eId;
-            child = ch;
-            posxyz = pos;
-        }
-    };
-    EntityID anotherBoxTransformId;
-    std::vector<LinkOctTreeAndModel> linkOM;
-    OctTree someOctTree;
-
-    //constructor
-    HardcodedTestWorld()
-        : World()
-        , someOctTree(AABB(glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(1.0f, 1.0f, 1.0f)), 2)
-    {
-        registerTestComponents();
-        //createTestEntities();
-    }
-
-private:
-    void registerTestComponents()
-    {
-        ComponentWrapperFactory f;
-
-
-        f = ComponentWrapperFactory("Test");
-        f.AddProperty("TestInteger", 1337);
-        f.AddProperty("TestFloat", 13.37f);
-        f.AddProperty("TestString", std::string("Carlito"));
-        RegisterComponent(f);
-
-        f = ComponentWrapperFactory("Debug");
-        f.AddProperty("Name", std::string("Unnamed"));
-        RegisterComponent(f);
-
-        f = ComponentWrapperFactory("Transform");
-        f.AddProperty("Position", glm::vec3(0.f, 0.f, 0.f));
-        f.AddProperty("Orientation", glm::quat());
-        f.AddProperty("Scale", glm::vec3(1.f, 1.f, 1.f));
-        RegisterComponent(f);
-
-        f = ComponentWrapperFactory("Model");
-        f.AddProperty("Resource", std::string());
-        f.AddProperty("Color", glm::vec4(1.f, 1.f, 1.f, 1.f));
-        f.AddProperty("Visible", true);
-        RegisterComponent(f);
-    }
-
-    void createTestEntitiesTest1()
-    {
-        World& world = *this;
-        EntityID tempId;
-        //add octTree
-        {
-            //copy of mainbox
-            auto someAABB = AABB(glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(1.0f, 1.0f, 1.0f));
-
-            //draw main box first
-            AddBoxModel(someAABB.Center(), someAABB.HalfSize().x, someOctTree.m_Root, tempId);
-
-            //add anotherbox in octTree
-            auto anotherBox = AABB(glm::vec3(0.1f, 0.1f, 0.1f), glm::vec3(0.2f, 0.2f, 0.2f));
-            //note: have to delete the box in the tree first, since were trying to move the box
-            someOctTree.AddDynamicObject(anotherBox);
-
-            //draw anotherbox and save it in anotherBoxTransformId
-            AddBoxModel(anotherBox.Center(), anotherBox.HalfSize().x, someOctTree.m_Root, anotherBoxTransformId);
-
-            //draw the octTree
-            for (size_t j = 0; j < 8; j++)
-            {
-                AddBoxModel(someOctTree.m_Root->m_Children[j]->m_Box.Center(),
-                    someOctTree.m_Root->m_Children[j]->m_Box.HalfSize().x, someOctTree.m_Root->m_Children[j], tempId);
-
-                auto someChild = someOctTree.m_Root->m_Children[j];
-
-                for (size_t i = 0; i < 8; i++)
-                {
-                    AddBoxModel(someChild->m_Children[i]->m_Box.Center(),
-                        someChild->m_Children[i]->m_Box.HalfSize().x, someChild->m_Children[i], tempId);
-                }
-            }
-        }
-    }//end CreateEnt
-
-    void createTestEntitiesTest2()
-    {
-        World& world = *this;
-
-        EntityID entityCollisionBox = world.CreateEntity();
-        ComponentWrapper transform = world.AttachComponent(entityCollisionBox, "Transform");
-        transform["Position"] = glm::vec3(0.f, 2.f, 0.f);
-        ComponentWrapper model = world.AttachComponent(entityCollisionBox, "Model");
-        model["Resource"] = "Models/Core/UnitBox.obj";
-    }
-
-    void AddBoxModel(const glm::vec3 &center, const float &halfSize, OctTree::OctChild* child, EntityID &outEntityId) {
-        World& world = *this;
-
-        EntityID entityDummyScene = world.CreateEntity();
-        outEntityId = entityDummyScene;
-        ComponentWrapper transform = world.AttachComponent(entityDummyScene, "Transform");
-        transform["Position"] = center;
-        transform["Scale"] = glm::vec3(1.0f, 1.0f, 1.0f)*halfSize*2.0f*0.97f;
-        ComponentWrapper model = world.AttachComponent(entityDummyScene, "Model");
-        model["Resource"] = "Models/Core/UnitBox.obj";
-        model["Color"] = glm::vec4(0.0f, 0.0f, 0.0f, 1.0f);
-        if (child->m_DynamicObjIndices.size() != 0)
-            model["Color"] = glm::vec4(1.0f, 1.0f, 1.0f, 1.0f);
-
-        linkOM.emplace_back(entityDummyScene, child, center);
-    }
-};
\ No newline at end of file