diff --git a/Extras/CDTestFramework/BulletSAPCompleteBoxPruningTest.cpp b/Extras/CDTestFramework/BulletSAPCompleteBoxPruningTest.cpp
index e18c8cb12..83fd2ab68 100644
--- a/Extras/CDTestFramework/BulletSAPCompleteBoxPruningTest.cpp
+++ b/Extras/CDTestFramework/BulletSAPCompleteBoxPruningTest.cpp
@@ -198,7 +198,7 @@ extern int doTree;
 
 void BulletSAPCompleteBoxPruningTest::PerformTest()
 {
-	int numUpdatedBoxes = mNbBoxes/*/10*/;
+	int numUpdatedBoxes = (mNbBoxes*10)/100;
 	if (m_firstTime)
 	{
 		numUpdatedBoxes = mNbBoxes;
diff --git a/Extras/CDTestFramework/CDTestFramework.sln b/Extras/CDTestFramework/CDTestFramework.sln
index 417c1d907..1038a030d 100644
--- a/Extras/CDTestFramework/CDTestFramework.sln
+++ b/Extras/CDTestFramework/CDTestFramework.sln
@@ -9,9 +9,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CDTestFramework", "CDTestFr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Opcode", "Opcode\Opcode.vcproj", "{DBE44CA3-2912-4441-8D99-AA2242688AD2}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletcollision", "Bullet\msvc\8\libbulletcollision.vcproj", "{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "..\..\msvc\8\libbulletmath.vcproj", "{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "Bullet\msvc\8\libbulletmath.vcproj", "{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletcollision", "..\..\msvc\8\libbulletcollision.vcproj", "{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -37,14 +37,6 @@ Global
 		{DBE44CA3-2912-4441-8D99-AA2242688AD2}.Release|Win32.Build.0 = Release|Win32
 		{DBE44CA3-2912-4441-8D99-AA2242688AD2}.ReleaseDoublePrecision|Win32.ActiveCfg = Release|Win32
 		{DBE44CA3-2912-4441-8D99-AA2242688AD2}.ReleaseDoublePrecision|Win32.Build.0 = Release|Win32
-		{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Debug|Win32.Build.0 = Debug|Win32
-		{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.DebugDoublePrecision|Win32.ActiveCfg = DebugDoublePrecision|Win32
-		{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.DebugDoublePrecision|Win32.Build.0 = DebugDoublePrecision|Win32
-		{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Release|Win32.ActiveCfg = Release|Win32
-		{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Release|Win32.Build.0 = Release|Win32
-		{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.ReleaseDoublePrecision|Win32.ActiveCfg = ReleaseDoublePrecision|Win32
-		{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.ReleaseDoublePrecision|Win32.Build.0 = ReleaseDoublePrecision|Win32
 		{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Debug|Win32.Build.0 = Debug|Win32
 		{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.DebugDoublePrecision|Win32.ActiveCfg = DebugDoublePrecision|Win32
@@ -53,6 +45,14 @@ Global
 		{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.Release|Win32.Build.0 = Release|Win32
 		{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.ReleaseDoublePrecision|Win32.ActiveCfg = ReleaseDoublePrecision|Win32
 		{7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}.ReleaseDoublePrecision|Win32.Build.0 = ReleaseDoublePrecision|Win32
+		{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Debug|Win32.Build.0 = Debug|Win32
+		{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.DebugDoublePrecision|Win32.ActiveCfg = DebugDoublePrecision|Win32
+		{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.DebugDoublePrecision|Win32.Build.0 = DebugDoublePrecision|Win32
+		{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Release|Win32.ActiveCfg = Release|Win32
+		{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Release|Win32.Build.0 = Release|Win32
+		{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.ReleaseDoublePrecision|Win32.ActiveCfg = ReleaseDoublePrecision|Win32
+		{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.ReleaseDoublePrecision|Win32.Build.0 = ReleaseDoublePrecision|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Extras/CDTestFramework/CDTestFramework.vcproj b/Extras/CDTestFramework/CDTestFramework.vcproj
index 38d27f22e..878e073f1 100644
--- a/Extras/CDTestFramework/CDTestFramework.vcproj
+++ b/Extras/CDTestFramework/CDTestFramework.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\Opcode;&quot;.\bullet-2.46\src&quot;;.\AntTweakBar\include;.\GIMPACT\Include;.\Bullet\src"
+				AdditionalIncludeDirectories=".\Opcode;.\AntTweakBar\include;.\GIMPACT\Include;../../src;../../Glut"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				ExceptionHandling="0"
@@ -120,7 +120,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\Opcode;&quot;.\bullet-2.46\src&quot;;.\AntTweakBar\include;.\GIMPACT\Include;.\Bullet\src"
+				AdditionalIncludeDirectories=".\Opcode;.\AntTweakBar\include;.\GIMPACT\Include;../../src;../../Glut"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				ExceptionHandling="0"
 				RuntimeLibrary="0"
diff --git a/Extras/CDTestFramework/CompleteBoxPruning.cpp b/Extras/CDTestFramework/CompleteBoxPruning.cpp
index fe131910d..773fc0bce 100644
--- a/Extras/CDTestFramework/CompleteBoxPruning.cpp
+++ b/Extras/CDTestFramework/CompleteBoxPruning.cpp
@@ -107,7 +107,7 @@ bool CompleteBoxPruningTest::UpdateBoxes(int numBoxes)
 
 void CompleteBoxPruningTest::PerformTest()
 {
-	int numBoxes = mNbBoxes/*/10*/;
+	int numBoxes = (mNbBoxes*10)/100;
 	if (m_firstTime)
 	{
 		numBoxes = mNbBoxes;
diff --git a/Extras/CDTestFramework/DbvtTest.cpp b/Extras/CDTestFramework/DbvtTest.cpp
index b2a22c8cd..4d53ee56b 100644
--- a/Extras/CDTestFramework/DbvtTest.cpp
+++ b/Extras/CDTestFramework/DbvtTest.cpp
@@ -221,7 +221,7 @@ btDbvtBroadphase*	pb=(btDbvtBroadphase*)m_broadphase;
 const btScalar		speed=m_speed;
 const btScalar		ampl=m_amp;
 const int			nupd=m_bfirsttime?	pb->m_proxies.size():
-										(pb->m_proxies.size()*100)/100;
+										(pb->m_proxies.size()*10)/100;
 /* Move boxes		*/ 
 m_profiler.Start();
 for(int i=0;i<nupd;i++)