diff --git a/ProGen/templates/vs100/Win32/testsuite/debug_shared.template b/ProGen/templates/vs100/Win32/testsuite/debug_shared.template
index a77aa9cbc..94f2e8358 100644
--- a/ProGen/templates/vs100/Win32/testsuite/debug_shared.template
+++ b/ProGen/templates/vs100/Win32/testsuite/debug_shared.template
@@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib WinTestRunnerd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies="WinTestRunnerd.lib ${configuration.linker.dependencies}"
 		OutputFile="bin\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs100/Win32/testsuite/debug_static_md.template b/ProGen/templates/vs100/Win32/testsuite/debug_static_md.template
index 64d6db149..6b1036671 100644
--- a/ProGen/templates/vs100/Win32/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs100/Win32/testsuite/debug_static_md.template
@@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib WinTestRunnermdd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs100/Win32/testsuite/debug_static_mt.template b/ProGen/templates/vs100/Win32/testsuite/debug_static_mt.template
index 755f3b2f1..0df19f640 100644
--- a/ProGen/templates/vs100/Win32/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs100/Win32/testsuite/debug_static_mt.template
@@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib WinTestRunnermtd.lib iphlpapi.lib winmm.lib nafxcwd.lib libcmtd.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs100/Win32/testsuite/release_shared.template b/ProGen/templates/vs100/Win32/testsuite/release_shared.template
index 158dccf04..18a8ebb5a 100644
--- a/ProGen/templates/vs100/Win32/testsuite/release_shared.template
+++ b/ProGen/templates/vs100/Win32/testsuite/release_shared.template
@@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib WinTestRunner.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs100/Win32/testsuite/release_static_md.template b/ProGen/templates/vs100/Win32/testsuite/release_static_md.template
index 0c8d5276e..6627e9484 100644
--- a/ProGen/templates/vs100/Win32/testsuite/release_static_md.template
+++ b/ProGen/templates/vs100/Win32/testsuite/release_static_md.template
@@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib WinTestRunnermd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs100/Win32/testsuite/release_static_mt.template b/ProGen/templates/vs100/Win32/testsuite/release_static_mt.template
index 434015170..cd295e2dc 100644
--- a/ProGen/templates/vs100/Win32/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs100/Win32/testsuite/release_static_mt.template
@@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib WinTestRunnermt.lib iphlpapi.lib winmm.lib nafxcw.lib libcmt.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs100/x64/testsuite/debug_shared.template b/ProGen/templates/vs100/x64/testsuite/debug_shared.template
index a21e1513d..db7dd7ff8 100644
--- a/ProGen/templates/vs100/x64/testsuite/debug_shared.template
+++ b/ProGen/templates/vs100/x64/testsuite/debug_shared.template
@@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib WinTestRunnerd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs100/x64/testsuite/debug_static_md.template b/ProGen/templates/vs100/x64/testsuite/debug_static_md.template
index fa1367924..c78f1ca2b 100644
--- a/ProGen/templates/vs100/x64/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs100/x64/testsuite/debug_static_md.template
@@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib WinTestRunnermdd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs100/x64/testsuite/debug_static_mt.template b/ProGen/templates/vs100/x64/testsuite/debug_static_mt.template
index 433e38ca9..47a854417 100644
--- a/ProGen/templates/vs100/x64/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs100/x64/testsuite/debug_static_mt.template
@@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib WinTestRunnermtd.lib iphlpapi.lib winmm.lib nafxcwd.lib libcmtd.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs100/x64/testsuite/release_shared.template b/ProGen/templates/vs100/x64/testsuite/release_shared.template
index 68ef679c7..5484f1cdf 100644
--- a/ProGen/templates/vs100/x64/testsuite/release_shared.template
+++ b/ProGen/templates/vs100/x64/testsuite/release_shared.template
@@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib WinTestRunner.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs100/x64/testsuite/release_static_md.template b/ProGen/templates/vs100/x64/testsuite/release_static_md.template
index 930b4c17d..ca5680361 100644
--- a/ProGen/templates/vs100/x64/testsuite/release_static_md.template
+++ b/ProGen/templates/vs100/x64/testsuite/release_static_md.template
@@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib WinTestRunnermd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs100/x64/testsuite/release_static_mt.template b/ProGen/templates/vs100/x64/testsuite/release_static_mt.template
index bf9b0d7f6..c85d5e18c 100644
--- a/ProGen/templates/vs100/x64/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs100/x64/testsuite/release_static_mt.template
@@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib WinTestRunnermt.lib iphlpapi.lib winmm.lib nafxcw.lib libcmt.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs110/Win32/testsuite/debug_shared.template b/ProGen/templates/vs110/Win32/testsuite/debug_shared.template
index a77aa9cbc..5e14cff2f 100644
--- a/ProGen/templates/vs110/Win32/testsuite/debug_shared.template
+++ b/ProGen/templates/vs110/Win32/testsuite/debug_shared.template
@@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib WinTestRunnerd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs110/Win32/testsuite/debug_static_md.template b/ProGen/templates/vs110/Win32/testsuite/debug_static_md.template
index 64d6db149..6b1036671 100644
--- a/ProGen/templates/vs110/Win32/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs110/Win32/testsuite/debug_static_md.template
@@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib WinTestRunnermdd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs110/Win32/testsuite/debug_static_mt.template b/ProGen/templates/vs110/Win32/testsuite/debug_static_mt.template
index 755f3b2f1..0df19f640 100644
--- a/ProGen/templates/vs110/Win32/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs110/Win32/testsuite/debug_static_mt.template
@@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib WinTestRunnermtd.lib iphlpapi.lib winmm.lib nafxcwd.lib libcmtd.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs110/Win32/testsuite/release_shared.template b/ProGen/templates/vs110/Win32/testsuite/release_shared.template
index 158dccf04..18a8ebb5a 100644
--- a/ProGen/templates/vs110/Win32/testsuite/release_shared.template
+++ b/ProGen/templates/vs110/Win32/testsuite/release_shared.template
@@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib WinTestRunner.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs110/Win32/testsuite/release_static_md.template b/ProGen/templates/vs110/Win32/testsuite/release_static_md.template
index 0c8d5276e..6627e9484 100644
--- a/ProGen/templates/vs110/Win32/testsuite/release_static_md.template
+++ b/ProGen/templates/vs110/Win32/testsuite/release_static_md.template
@@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib WinTestRunnermd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs110/Win32/testsuite/release_static_mt.template b/ProGen/templates/vs110/Win32/testsuite/release_static_mt.template
index 434015170..cd295e2dc 100644
--- a/ProGen/templates/vs110/Win32/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs110/Win32/testsuite/release_static_mt.template
@@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib WinTestRunnermt.lib iphlpapi.lib winmm.lib nafxcw.lib libcmt.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs110/WinCE/testsuite/debug_shared.template b/ProGen/templates/vs110/WinCE/testsuite/debug_shared.template
index 631d1e21a..7dbd7fa1b 100644
--- a/ProGen/templates/vs110/WinCE/testsuite/debug_shared.template
+++ b/ProGen/templates/vs110/WinCE/testsuite/debug_shared.template
@@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\shared\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
diff --git a/ProGen/templates/vs110/WinCE/testsuite/debug_static_md.template b/ProGen/templates/vs110/WinCE/testsuite/debug_static_md.template
index 026aae978..de0d90f68 100644
--- a/ProGen/templates/vs110/WinCE/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs110/WinCE/testsuite/debug_static_md.template
@@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
diff --git a/ProGen/templates/vs110/WinCE/testsuite/debug_static_mt.template b/ProGen/templates/vs110/WinCE/testsuite/debug_static_mt.template
index c43b39613..f06f0f2fe 100644
--- a/ProGen/templates/vs110/WinCE/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs110/WinCE/testsuite/debug_static_mt.template
@@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib iphlpapi.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
diff --git a/ProGen/templates/vs110/WinCE/testsuite/release_shared.template b/ProGen/templates/vs110/WinCE/testsuite/release_shared.template
index 33dc4135b..241d9e76f 100644
--- a/ProGen/templates/vs110/WinCE/testsuite/release_shared.template
+++ b/ProGen/templates/vs110/WinCE/testsuite/release_shared.template
@@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\shared\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
diff --git a/ProGen/templates/vs110/WinCE/testsuite/release_static_md.template b/ProGen/templates/vs110/WinCE/testsuite/release_static_md.template
index 54b1b3f65..23766b569 100644
--- a/ProGen/templates/vs110/WinCE/testsuite/release_static_md.template
+++ b/ProGen/templates/vs110/WinCE/testsuite/release_static_md.template
@@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib iphlpapi.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
diff --git a/ProGen/templates/vs110/WinCE/testsuite/release_static_mt.template b/ProGen/templates/vs110/WinCE/testsuite/release_static_mt.template
index bafe35d16..a6604e558 100644
--- a/ProGen/templates/vs110/WinCE/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs110/WinCE/testsuite/release_static_mt.template
@@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib iphlpapi.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
diff --git a/ProGen/templates/vs110/x64/testsuite/debug_shared.template b/ProGen/templates/vs110/x64/testsuite/debug_shared.template
index a21e1513d..db7dd7ff8 100644
--- a/ProGen/templates/vs110/x64/testsuite/debug_shared.template
+++ b/ProGen/templates/vs110/x64/testsuite/debug_shared.template
@@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib WinTestRunnerd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs110/x64/testsuite/debug_static_md.template b/ProGen/templates/vs110/x64/testsuite/debug_static_md.template
index fa1367924..c78f1ca2b 100644
--- a/ProGen/templates/vs110/x64/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs110/x64/testsuite/debug_static_md.template
@@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib WinTestRunnermdd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs110/x64/testsuite/debug_static_mt.template b/ProGen/templates/vs110/x64/testsuite/debug_static_mt.template
index 433e38ca9..47a854417 100644
--- a/ProGen/templates/vs110/x64/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs110/x64/testsuite/debug_static_mt.template
@@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib WinTestRunnermtd.lib iphlpapi.lib winmm.lib nafxcwd.lib libcmtd.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs110/x64/testsuite/release_shared.template b/ProGen/templates/vs110/x64/testsuite/release_shared.template
index 68ef679c7..5484f1cdf 100644
--- a/ProGen/templates/vs110/x64/testsuite/release_shared.template
+++ b/ProGen/templates/vs110/x64/testsuite/release_shared.template
@@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib WinTestRunner.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs110/x64/testsuite/release_static_md.template b/ProGen/templates/vs110/x64/testsuite/release_static_md.template
index 930b4c17d..ca5680361 100644
--- a/ProGen/templates/vs110/x64/testsuite/release_static_md.template
+++ b/ProGen/templates/vs110/x64/testsuite/release_static_md.template
@@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib WinTestRunnermd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs110/x64/testsuite/release_static_mt.template b/ProGen/templates/vs110/x64/testsuite/release_static_mt.template
index bf9b0d7f6..c85d5e18c 100644
--- a/ProGen/templates/vs110/x64/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs110/x64/testsuite/release_static_mt.template
@@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib WinTestRunnermt.lib iphlpapi.lib winmm.lib nafxcw.lib libcmt.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs120/Win32/testsuite/debug_shared.template b/ProGen/templates/vs120/Win32/testsuite/debug_shared.template
index 7defc61d9..272043e0c 100644
--- a/ProGen/templates/vs120/Win32/testsuite/debug_shared.template
+++ b/ProGen/templates/vs120/Win32/testsuite/debug_shared.template
@@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs120/Win32/testsuite/debug_static_md.template b/ProGen/templates/vs120/Win32/testsuite/debug_static_md.template
index 1093125a2..eb49b3942 100644
--- a/ProGen/templates/vs120/Win32/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs120/Win32/testsuite/debug_static_md.template
@@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs120/Win32/testsuite/debug_static_mt.template b/ProGen/templates/vs120/Win32/testsuite/debug_static_mt.template
index 4745902ef..f6cbb5e74 100644
--- a/ProGen/templates/vs120/Win32/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs120/Win32/testsuite/debug_static_mt.template
@@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs120/Win32/testsuite/release_shared.template b/ProGen/templates/vs120/Win32/testsuite/release_shared.template
index 443b63aec..25f58a28d 100644
--- a/ProGen/templates/vs120/Win32/testsuite/release_shared.template
+++ b/ProGen/templates/vs120/Win32/testsuite/release_shared.template
@@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs120/Win32/testsuite/release_static_md.template b/ProGen/templates/vs120/Win32/testsuite/release_static_md.template
index 78326c39d..1a0967923 100644
--- a/ProGen/templates/vs120/Win32/testsuite/release_static_md.template
+++ b/ProGen/templates/vs120/Win32/testsuite/release_static_md.template
@@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs120/Win32/testsuite/release_static_mt.template b/ProGen/templates/vs120/Win32/testsuite/release_static_mt.template
index 0f04ee906..0ba4ece01 100644
--- a/ProGen/templates/vs120/Win32/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs120/Win32/testsuite/release_static_mt.template
@@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs120/WinCE/testsuite/debug_shared.template b/ProGen/templates/vs120/WinCE/testsuite/debug_shared.template
index 631d1e21a..7dbd7fa1b 100644
--- a/ProGen/templates/vs120/WinCE/testsuite/debug_shared.template
+++ b/ProGen/templates/vs120/WinCE/testsuite/debug_shared.template
@@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\shared\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
diff --git a/ProGen/templates/vs120/WinCE/testsuite/debug_static_md.template b/ProGen/templates/vs120/WinCE/testsuite/debug_static_md.template
index 026aae978..de0d90f68 100644
--- a/ProGen/templates/vs120/WinCE/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs120/WinCE/testsuite/debug_static_md.template
@@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
diff --git a/ProGen/templates/vs120/WinCE/testsuite/debug_static_mt.template b/ProGen/templates/vs120/WinCE/testsuite/debug_static_mt.template
index c43b39613..f06f0f2fe 100644
--- a/ProGen/templates/vs120/WinCE/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs120/WinCE/testsuite/debug_static_mt.template
@@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib iphlpapi.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
diff --git a/ProGen/templates/vs120/WinCE/testsuite/release_shared.template b/ProGen/templates/vs120/WinCE/testsuite/release_shared.template
index 33dc4135b..241d9e76f 100644
--- a/ProGen/templates/vs120/WinCE/testsuite/release_shared.template
+++ b/ProGen/templates/vs120/WinCE/testsuite/release_shared.template
@@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\shared\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
diff --git a/ProGen/templates/vs120/WinCE/testsuite/release_static_md.template b/ProGen/templates/vs120/WinCE/testsuite/release_static_md.template
index 54b1b3f65..23766b569 100644
--- a/ProGen/templates/vs120/WinCE/testsuite/release_static_md.template
+++ b/ProGen/templates/vs120/WinCE/testsuite/release_static_md.template
@@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib iphlpapi.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
diff --git a/ProGen/templates/vs120/WinCE/testsuite/release_static_mt.template b/ProGen/templates/vs120/WinCE/testsuite/release_static_mt.template
index bafe35d16..a6604e558 100644
--- a/ProGen/templates/vs120/WinCE/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs120/WinCE/testsuite/release_static_mt.template
@@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib iphlpapi.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
diff --git a/ProGen/templates/vs120/x64/testsuite/debug_shared.template b/ProGen/templates/vs120/x64/testsuite/debug_shared.template
index 94c39f852..8e561cb72 100644
--- a/ProGen/templates/vs120/x64/testsuite/debug_shared.template
+++ b/ProGen/templates/vs120/x64/testsuite/debug_shared.template
@@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs120/x64/testsuite/debug_static_md.template b/ProGen/templates/vs120/x64/testsuite/debug_static_md.template
index 49a37233e..e1464a71f 100644
--- a/ProGen/templates/vs120/x64/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs120/x64/testsuite/debug_static_md.template
@@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs120/x64/testsuite/debug_static_mt.template b/ProGen/templates/vs120/x64/testsuite/debug_static_mt.template
index 1cfaf5d15..ad5c55f1c 100644
--- a/ProGen/templates/vs120/x64/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs120/x64/testsuite/debug_static_mt.template
@@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs120/x64/testsuite/release_shared.template b/ProGen/templates/vs120/x64/testsuite/release_shared.template
index 4ccc00393..0b00829cf 100644
--- a/ProGen/templates/vs120/x64/testsuite/release_shared.template
+++ b/ProGen/templates/vs120/x64/testsuite/release_shared.template
@@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs120/x64/testsuite/release_static_md.template b/ProGen/templates/vs120/x64/testsuite/release_static_md.template
index 5aff313e9..21b7cdc49 100644
--- a/ProGen/templates/vs120/x64/testsuite/release_static_md.template
+++ b/ProGen/templates/vs120/x64/testsuite/release_static_md.template
@@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs120/x64/testsuite/release_static_mt.template b/ProGen/templates/vs120/x64/testsuite/release_static_mt.template
index 82292b690..6c11104d2 100644
--- a/ProGen/templates/vs120/x64/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs120/x64/testsuite/release_static_mt.template
@@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs140/Win32/testsuite/debug_shared.template b/ProGen/templates/vs140/Win32/testsuite/debug_shared.template
index 7defc61d9..272043e0c 100644
--- a/ProGen/templates/vs140/Win32/testsuite/debug_shared.template
+++ b/ProGen/templates/vs140/Win32/testsuite/debug_shared.template
@@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs140/Win32/testsuite/debug_static_md.template b/ProGen/templates/vs140/Win32/testsuite/debug_static_md.template
index 1093125a2..eb49b3942 100644
--- a/ProGen/templates/vs140/Win32/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs140/Win32/testsuite/debug_static_md.template
@@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs140/Win32/testsuite/debug_static_mt.template b/ProGen/templates/vs140/Win32/testsuite/debug_static_mt.template
index 4745902ef..f6cbb5e74 100644
--- a/ProGen/templates/vs140/Win32/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs140/Win32/testsuite/debug_static_mt.template
@@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs140/Win32/testsuite/release_shared.template b/ProGen/templates/vs140/Win32/testsuite/release_shared.template
index 443b63aec..25f58a28d 100644
--- a/ProGen/templates/vs140/Win32/testsuite/release_shared.template
+++ b/ProGen/templates/vs140/Win32/testsuite/release_shared.template
@@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs140/Win32/testsuite/release_static_md.template b/ProGen/templates/vs140/Win32/testsuite/release_static_md.template
index 78326c39d..1a0967923 100644
--- a/ProGen/templates/vs140/Win32/testsuite/release_static_md.template
+++ b/ProGen/templates/vs140/Win32/testsuite/release_static_md.template
@@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs140/Win32/testsuite/release_static_mt.template b/ProGen/templates/vs140/Win32/testsuite/release_static_mt.template
index 0f04ee906..0ba4ece01 100644
--- a/ProGen/templates/vs140/Win32/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs140/Win32/testsuite/release_static_mt.template
@@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs140/x64/testsuite/debug_shared.template b/ProGen/templates/vs140/x64/testsuite/debug_shared.template
index 94c39f852..8e561cb72 100644
--- a/ProGen/templates/vs140/x64/testsuite/debug_shared.template
+++ b/ProGen/templates/vs140/x64/testsuite/debug_shared.template
@@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs140/x64/testsuite/debug_static_md.template b/ProGen/templates/vs140/x64/testsuite/debug_static_md.template
index 49a37233e..e1464a71f 100644
--- a/ProGen/templates/vs140/x64/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs140/x64/testsuite/debug_static_md.template
@@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs140/x64/testsuite/debug_static_mt.template b/ProGen/templates/vs140/x64/testsuite/debug_static_mt.template
index 1cfaf5d15..ad5c55f1c 100644
--- a/ProGen/templates/vs140/x64/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs140/x64/testsuite/debug_static_mt.template
@@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs140/x64/testsuite/release_shared.template b/ProGen/templates/vs140/x64/testsuite/release_shared.template
index 4ccc00393..0b00829cf 100644
--- a/ProGen/templates/vs140/x64/testsuite/release_shared.template
+++ b/ProGen/templates/vs140/x64/testsuite/release_shared.template
@@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs140/x64/testsuite/release_static_md.template b/ProGen/templates/vs140/x64/testsuite/release_static_md.template
index 5aff313e9..21b7cdc49 100644
--- a/ProGen/templates/vs140/x64/testsuite/release_static_md.template
+++ b/ProGen/templates/vs140/x64/testsuite/release_static_md.template
@@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs140/x64/testsuite/release_static_mt.template b/ProGen/templates/vs140/x64/testsuite/release_static_mt.template
index 82292b690..6c11104d2 100644
--- a/ProGen/templates/vs140/x64/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs140/x64/testsuite/release_static_mt.template
@@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs150/Win32/testsuite/debug_shared.template b/ProGen/templates/vs150/Win32/testsuite/debug_shared.template
index 7defc61d9..272043e0c 100644
--- a/ProGen/templates/vs150/Win32/testsuite/debug_shared.template
+++ b/ProGen/templates/vs150/Win32/testsuite/debug_shared.template
@@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs150/Win32/testsuite/debug_static_md.template b/ProGen/templates/vs150/Win32/testsuite/debug_static_md.template
index 1093125a2..eb49b3942 100644
--- a/ProGen/templates/vs150/Win32/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs150/Win32/testsuite/debug_static_md.template
@@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs150/Win32/testsuite/debug_static_mt.template b/ProGen/templates/vs150/Win32/testsuite/debug_static_mt.template
index 4745902ef..f6cbb5e74 100644
--- a/ProGen/templates/vs150/Win32/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs150/Win32/testsuite/debug_static_mt.template
@@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs150/Win32/testsuite/release_shared.template b/ProGen/templates/vs150/Win32/testsuite/release_shared.template
index 443b63aec..25f58a28d 100644
--- a/ProGen/templates/vs150/Win32/testsuite/release_shared.template
+++ b/ProGen/templates/vs150/Win32/testsuite/release_shared.template
@@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs150/Win32/testsuite/release_static_md.template b/ProGen/templates/vs150/Win32/testsuite/release_static_md.template
index 78326c39d..1a0967923 100644
--- a/ProGen/templates/vs150/Win32/testsuite/release_static_md.template
+++ b/ProGen/templates/vs150/Win32/testsuite/release_static_md.template
@@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs150/Win32/testsuite/release_static_mt.template b/ProGen/templates/vs150/Win32/testsuite/release_static_mt.template
index 0f04ee906..0ba4ece01 100644
--- a/ProGen/templates/vs150/Win32/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs150/Win32/testsuite/release_static_mt.template
@@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs150/x64/testsuite/debug_shared.template b/ProGen/templates/vs150/x64/testsuite/debug_shared.template
index 94c39f852..8e561cb72 100644
--- a/ProGen/templates/vs150/x64/testsuite/debug_shared.template
+++ b/ProGen/templates/vs150/x64/testsuite/debug_shared.template
@@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs150/x64/testsuite/debug_static_md.template b/ProGen/templates/vs150/x64/testsuite/debug_static_md.template
index 49a37233e..e1464a71f 100644
--- a/ProGen/templates/vs150/x64/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs150/x64/testsuite/debug_static_md.template
@@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs150/x64/testsuite/debug_static_mt.template b/ProGen/templates/vs150/x64/testsuite/debug_static_mt.template
index 1cfaf5d15..ad5c55f1c 100644
--- a/ProGen/templates/vs150/x64/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs150/x64/testsuite/debug_static_mt.template
@@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs150/x64/testsuite/release_shared.template b/ProGen/templates/vs150/x64/testsuite/release_shared.template
index 4ccc00393..0b00829cf 100644
--- a/ProGen/templates/vs150/x64/testsuite/release_shared.template
+++ b/ProGen/templates/vs150/x64/testsuite/release_shared.template
@@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs150/x64/testsuite/release_static_md.template b/ProGen/templates/vs150/x64/testsuite/release_static_md.template
index 5aff313e9..21b7cdc49 100644
--- a/ProGen/templates/vs150/x64/testsuite/release_static_md.template
+++ b/ProGen/templates/vs150/x64/testsuite/release_static_md.template
@@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs150/x64/testsuite/release_static_mt.template b/ProGen/templates/vs150/x64/testsuite/release_static_mt.template
index 82292b690..6c11104d2 100644
--- a/ProGen/templates/vs150/x64/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs150/x64/testsuite/release_static_mt.template
@@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs90/Win32/testsuite/debug_shared.template b/ProGen/templates/vs90/Win32/testsuite/debug_shared.template
index 713ed305e..c1a97a1ca 100644
--- a/ProGen/templates/vs90/Win32/testsuite/debug_shared.template
+++ b/ProGen/templates/vs90/Win32/testsuite/debug_shared.template
@@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib WinTestRunnerd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs90/Win32/testsuite/debug_static_md.template b/ProGen/templates/vs90/Win32/testsuite/debug_static_md.template
index 19e589f3a..db37414a4 100644
--- a/ProGen/templates/vs90/Win32/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs90/Win32/testsuite/debug_static_md.template
@@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib WinTestRunnermdd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs90/Win32/testsuite/debug_static_mt.template b/ProGen/templates/vs90/Win32/testsuite/debug_static_mt.template
index 884e93e47..3e7ab788a 100644
--- a/ProGen/templates/vs90/Win32/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs90/Win32/testsuite/debug_static_mt.template
@@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib WinTestRunnermtd.lib iphlpapi.lib winmm.lib nafxcwd.lib libcmtd.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs90/Win32/testsuite/release_shared.template b/ProGen/templates/vs90/Win32/testsuite/release_shared.template
index 509a0ce0c..dbe14e78e 100644
--- a/ProGen/templates/vs90/Win32/testsuite/release_shared.template
+++ b/ProGen/templates/vs90/Win32/testsuite/release_shared.template
@@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib WinTestRunner.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs90/Win32/testsuite/release_static_md.template b/ProGen/templates/vs90/Win32/testsuite/release_static_md.template
index ed4d85ca3..70c4562d7 100644
--- a/ProGen/templates/vs90/Win32/testsuite/release_static_md.template
+++ b/ProGen/templates/vs90/Win32/testsuite/release_static_md.template
@@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib WinTestRunnermd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs90/Win32/testsuite/release_static_mt.template b/ProGen/templates/vs90/Win32/testsuite/release_static_mt.template
index 63d77dacd..30f382124 100644
--- a/ProGen/templates/vs90/Win32/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs90/Win32/testsuite/release_static_mt.template
@@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib WinTestRunnermt.lib iphlpapi.lib winmm.lib nafxcw.lib libcmt.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
diff --git a/ProGen/templates/vs90/WinCE/testsuite/debug_shared.template b/ProGen/templates/vs90/WinCE/testsuite/debug_shared.template
index 69e4da2ef..fd583167d 100644
--- a/ProGen/templates/vs90/WinCE/testsuite/debug_shared.template
+++ b/ProGen/templates/vs90/WinCE/testsuite/debug_shared.template
@@ -53,7 +53,7 @@
 	<Tool
 		Name="VCLinkerTool"
 		AdditionalOptions="/FORCE:MULTIPLE ${configuration.linker.additionalOptions}"
-		AdditionalDependencies="CppUnitd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\shared\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
diff --git a/ProGen/templates/vs90/WinCE/testsuite/debug_static_md.template b/ProGen/templates/vs90/WinCE/testsuite/debug_static_md.template
index 1afb16fe1..c67c7e71b 100644
--- a/ProGen/templates/vs90/WinCE/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs90/WinCE/testsuite/debug_static_md.template
@@ -53,7 +53,7 @@
 	<Tool
 		Name="VCLinkerTool"
 		AdditionalOptions="/FORCE:MULTIPLE ${configuration.linker.additionalOptions}"
-		AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
diff --git a/ProGen/templates/vs90/WinCE/testsuite/debug_static_mt.template b/ProGen/templates/vs90/WinCE/testsuite/debug_static_mt.template
index 052d1c55d..fcedc5431 100644
--- a/ProGen/templates/vs90/WinCE/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs90/WinCE/testsuite/debug_static_mt.template
@@ -53,7 +53,7 @@
 	<Tool
 		Name="VCLinkerTool"
 		AdditionalOptions="/FORCE:MULTIPLE ${configuration.linker.additionalOptions}"
-		AdditionalDependencies="CppUnitmtd.lib iphlpapi.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
diff --git a/ProGen/templates/vs90/WinCE/testsuite/release_shared.template b/ProGen/templates/vs90/WinCE/testsuite/release_shared.template
index eb9df71b6..59c15e424 100644
--- a/ProGen/templates/vs90/WinCE/testsuite/release_shared.template
+++ b/ProGen/templates/vs90/WinCE/testsuite/release_shared.template
@@ -53,7 +53,7 @@
 	<Tool
 		Name="VCLinkerTool"
 		AdditionalOptions="/FORCE:MULTIPLE ${configuration.linker.additionalOptions}"
-		AdditionalDependencies="CppUnit.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\shared\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
diff --git a/ProGen/templates/vs90/WinCE/testsuite/release_static_md.template b/ProGen/templates/vs90/WinCE/testsuite/release_static_md.template
index fd346b6e8..f2f2b946e 100644
--- a/ProGen/templates/vs90/WinCE/testsuite/release_static_md.template
+++ b/ProGen/templates/vs90/WinCE/testsuite/release_static_md.template
@@ -56,7 +56,7 @@
 	<Tool
 		Name="VCLinkerTool"
 		AdditionalOptions="/FORCE:MULTIPLE ${configuration.linker.additionalOptions}"
-		AdditionalDependencies="CppUnitmd.lib iphlpapi.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
diff --git a/ProGen/templates/vs90/WinCE/testsuite/release_static_mt.template b/ProGen/templates/vs90/WinCE/testsuite/release_static_mt.template
index 0a74dd730..12a730d35 100644
--- a/ProGen/templates/vs90/WinCE/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs90/WinCE/testsuite/release_static_mt.template
@@ -56,7 +56,7 @@
 	<Tool
 		Name="VCLinkerTool"
 		AdditionalOptions="/FORCE:MULTIPLE ${configuration.linker.additionalOptions}"
-		AdditionalDependencies="CppUnitmt.lib iphlpapi.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
diff --git a/ProGen/templates/vs90/x64/testsuite/debug_shared.template b/ProGen/templates/vs90/x64/testsuite/debug_shared.template
index 4366bb94a..9c33c2a7c 100644
--- a/ProGen/templates/vs90/x64/testsuite/debug_shared.template
+++ b/ProGen/templates/vs90/x64/testsuite/debug_shared.template
@@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib WinTestRunnerd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs90/x64/testsuite/debug_static_md.template b/ProGen/templates/vs90/x64/testsuite/debug_static_md.template
index a47b4b8ae..67c24af54 100644
--- a/ProGen/templates/vs90/x64/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs90/x64/testsuite/debug_static_md.template
@@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib WinTestRunnermdd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs90/x64/testsuite/debug_static_mt.template b/ProGen/templates/vs90/x64/testsuite/debug_static_mt.template
index 046112625..d264302a9 100644
--- a/ProGen/templates/vs90/x64/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs90/x64/testsuite/debug_static_mt.template
@@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib WinTestRunnermtd.lib iphlpapi.lib winmm.lib nafxcwd.lib libcmtd.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs90/x64/testsuite/release_shared.template b/ProGen/templates/vs90/x64/testsuite/release_shared.template
index bd510dfbd..bff52b590 100644
--- a/ProGen/templates/vs90/x64/testsuite/release_shared.template
+++ b/ProGen/templates/vs90/x64/testsuite/release_shared.template
@@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib WinTestRunner.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs90/x64/testsuite/release_static_md.template b/ProGen/templates/vs90/x64/testsuite/release_static_md.template
index a461292c8..fc59e84fd 100644
--- a/ProGen/templates/vs90/x64/testsuite/release_static_md.template
+++ b/ProGen/templates/vs90/x64/testsuite/release_static_md.template
@@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib WinTestRunnermd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/ProGen/templates/vs90/x64/testsuite/release_static_mt.template b/ProGen/templates/vs90/x64/testsuite/release_static_mt.template
index 4ba67b5d3..c688888fd 100644
--- a/ProGen/templates/vs90/x64/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs90/x64/testsuite/release_static_mt.template
@@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib WinTestRunnermt.lib iphlpapi.lib winmm.lib nafxcw.lib libcmt.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
diff --git a/cppignore.cmd b/cppignore.cmd
index 420d74573..40408c256 100644
--- a/cppignore.cmd
+++ b/cppignore.cmd
@@ -14,4 +14,6 @@ class CppUnit::TestCaller^<class ThreadTest^>.testSleep, ^
 class CppUnit::TestCaller^<class TimerTest^>.testTimer, ^
 class CppUnit::TestCaller^<class TimerTest^>.testScheduleInterval, ^
 class CppUnit::TestCaller^<class TimerTest^>.testScheduleIntervalTimestamp, ^
+class CppUnit::TestCaller^<class TimerTest^>.testScheduleIntervalClock, ^
+class CppUnit::TestCaller^<class TimerTest^>.testScheduleAtFixedRate, ^
 %CPPUNIT_IGNORE%