diff --git a/SDK/include/NDK/BaseSystem.inl b/SDK/include/NDK/BaseSystem.inl
index 20b576b93..3e06bc543 100644
--- a/SDK/include/NDK/BaseSystem.inl
+++ b/SDK/include/NDK/BaseSystem.inl
@@ -171,7 +171,7 @@ namespace Ndk
 
 		if (m_maxUpdateRate > 0.f)
 		{
-			if (m_updateCounter > elapsedTime)
+			if (m_updateCounter >= m_maxUpdateRate)
 			{
 				if (m_fixedUpdateRate > 0.f)
 				{
@@ -184,7 +184,7 @@ namespace Ndk
 				else
 				{
 					OnUpdate(m_maxUpdateRate);
-					m_updateCounter -= elapsedTime;
+					m_updateCounter -= m_maxUpdateRate;
 				}
 			}
 		}
diff --git a/tests/SDK/NDK/BaseSystem.cpp b/tests/SDK/NDK/BaseSystem.cpp
index 3bb0fa9e4..84649df22 100644
--- a/tests/SDK/NDK/BaseSystem.cpp
+++ b/tests/SDK/NDK/BaseSystem.cpp
@@ -32,7 +32,8 @@ SCENARIO("BaseSystem", "[NDK][BASESYSTEM]")
 {
 	GIVEN("Our TestSystem")
 	{
-		Ndk::World world;
+		Ndk::World world(false);
+
 		Ndk::BaseSystem& system = world.AddSystem<TestSystem>();
 		REQUIRE(&system.GetWorld() == &world);
 
diff --git a/tests/SDK/NDK/Entity.cpp b/tests/SDK/NDK/Entity.cpp
index dd3216fb0..7d59cfc20 100644
--- a/tests/SDK/NDK/Entity.cpp
+++ b/tests/SDK/NDK/Entity.cpp
@@ -55,7 +55,8 @@ SCENARIO("Entity", "[NDK][ENTITY]")
 {
 	GIVEN("A world & an entity")
 	{
-		Ndk::World world;
+		Ndk::World world(false);
+
 		Ndk::BaseSystem& system = world.AddSystem<UpdateSystem>();
 		Ndk::EntityHandle entity = world.CreateEntity();
 
diff --git a/tests/SDK/NDK/EntityList.cpp b/tests/SDK/NDK/EntityList.cpp
index 30a57573d..0642b50b7 100644
--- a/tests/SDK/NDK/EntityList.cpp
+++ b/tests/SDK/NDK/EntityList.cpp
@@ -6,7 +6,8 @@ SCENARIO("EntityList", "[NDK][ENTITYLIST]")
 {
 	GIVEN("A world & a set of entities")
 	{
-		Ndk::World world;
+		Ndk::World world(false);
+
 		const Ndk::EntityHandle& entity = world.CreateEntity();
 		Ndk::EntityList entityList;
 		entityList.Insert(entity);
diff --git a/tests/SDK/NDK/EntityOwner.cpp b/tests/SDK/NDK/EntityOwner.cpp
index f2fd76d58..c28ed7d91 100644
--- a/tests/SDK/NDK/EntityOwner.cpp
+++ b/tests/SDK/NDK/EntityOwner.cpp
@@ -6,7 +6,7 @@ SCENARIO("EntityOwner", "[NDK][ENTITYOWNER]")
 {
 	GIVEN("A world & an entity")
 	{
-		Ndk::World world;
+		Ndk::World world(false);
 		Ndk::EntityHandle entity = world.CreateEntity();
 
 		WHEN("We set the ownership of the entity to our owner")
diff --git a/tests/SDK/NDK/Systems/PhysicsSystem2D.cpp b/tests/SDK/NDK/Systems/PhysicsSystem2D.cpp
index 0dc944130..9173ab167 100644
--- a/tests/SDK/NDK/Systems/PhysicsSystem2D.cpp
+++ b/tests/SDK/NDK/Systems/PhysicsSystem2D.cpp
@@ -19,6 +19,8 @@ SCENARIO("PhysicsSystem2D", "[NDK][PHYSICSSYSTEM2D]")
 		Ndk::NodeComponent& nodeComponent = movingEntity->GetComponent<Ndk::NodeComponent>();
 		Ndk::PhysicsComponent2D& physicsComponent2D = movingEntity->AddComponent<Ndk::PhysicsComponent2D>();
 
+		world.GetSystem<Ndk::PhysicsSystem2D>().SetFixedUpdateRate(30.f);
+
 		WHEN("We update the world")
 		{
 			world.Update(1.f);
@@ -77,6 +79,8 @@ SCENARIO("PhysicsSystem2D", "[NDK][PHYSICSSYSTEM2D]")
 		Ndk::NodeComponent& nodeComponent = movingEntity->GetComponent<Ndk::NodeComponent>();
 		Ndk::PhysicsComponent2D& physicsComponent2D = movingEntity->AddComponent<Ndk::PhysicsComponent2D>();
 
+		world.GetSystem<Ndk::PhysicsSystem2D>().SetFixedUpdateRate(30.f);
+
 		WHEN("We make rotate our entity")
 		{
 			float angularSpeed = Nz::FromDegrees(45.f);
@@ -119,6 +123,8 @@ SCENARIO("PhysicsSystem2D", "[NDK][PHYSICSSYSTEM2D]")
 		Ndk::NodeComponent& nodeComponent = movingEntity->GetComponent<Ndk::NodeComponent>();
 		Ndk::PhysicsComponent2D& physicsComponent2D = movingEntity->AddComponent<Ndk::PhysicsComponent2D>();
 
+		world.GetSystem<Ndk::PhysicsSystem2D>().SetFixedUpdateRate(30.f);
+
 		WHEN("We make rotate our entity")
 		{
 			float angularSpeed = Nz::FromDegrees(45.f);
diff --git a/tests/SDK/NDK/Systems/VelocitySystem.cpp b/tests/SDK/NDK/Systems/VelocitySystem.cpp
index bfde34896..aff645106 100644
--- a/tests/SDK/NDK/Systems/VelocitySystem.cpp
+++ b/tests/SDK/NDK/Systems/VelocitySystem.cpp
@@ -13,6 +13,8 @@ SCENARIO("VelocitySystem", "[NDK][VELOCITYSYSTEM]")
 		Ndk::VelocityComponent& velocityComponent = entity->AddComponent<Ndk::VelocityComponent>();
 		Ndk::NodeComponent& nodeComponent = entity->AddComponent<Ndk::NodeComponent>();
 
+		world.GetSystem<Ndk::VelocitySystem>().SetFixedUpdateRate(30.f);
+
 		WHEN("We give a speed to our entity")
 		{
 			Nz::Vector3f velocity = Nz::Vector3f::Unit() * 2.f;
diff --git a/tests/SDK/NDK/World.cpp b/tests/SDK/NDK/World.cpp
index d46b6621b..4d25db5f6 100644
--- a/tests/SDK/NDK/World.cpp
+++ b/tests/SDK/NDK/World.cpp
@@ -55,7 +55,7 @@ SCENARIO("World", "[NDK][WORLD]")
 {
 	GIVEN("A brave new world and the update system")
 	{
-		Ndk::World world;
+		Ndk::World world(false);
 		Ndk::BaseSystem& system = world.AddSystem<UpdateSystem>();
 
 		WHEN("We had a new entity with an updatable component and a system")