diff --git a/vs10/Arabica_tests.sln b/vs10/Arabica_tests.sln
index 9f95d747..9165f545 100644
--- a/vs10/Arabica_tests.sln
+++ b/vs10/Arabica_tests.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+# Visual C++ Express 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "lib_arabica.vcxproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM", "test_DOM.vcxproj", "{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}"
@@ -15,6 +15,9 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xpath_wide", "test_xpath_wide.vcxproj", "{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_utils", "test_utils.vcxproj", "{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}"
+	ProjectSection(ProjectDependencies) = postProject
+		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC} = {894C6ACE-97EE-497B-BC2C-310E6AC82EFC}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xslt", "test_xslt.vcxproj", "{44BA3424-C58E-4A49-ADDD-6180C61E5E34}"
 EndProject
@@ -24,6 +27,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter_silly", "te
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter_wide", "test_SAX_filter_wide.vcxproj", "{FB5B88E9-DAB3-401C-B413-77403C562C49}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnitLib", "CppUnitLib.vcxproj", "{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -78,6 +83,10 @@ Global
 		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Debug|Win32.Build.0 = Debug|Win32
 		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Release|Win32.ActiveCfg = Release|Win32
 		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Release|Win32.Build.0 = Release|Win32
+		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Debug|Win32.Build.0 = Debug|Win32
+		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Release|Win32.ActiveCfg = Release|Win32
+		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/vs10/CppUnitLib.vcxproj b/vs10/CppUnitLib.vcxproj
new file mode 100644
index 00000000..eb28d763
--- /dev/null
+++ b/vs10/CppUnitLib.vcxproj
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}</ProjectGuid>
+    <RootNamespace>CppUnitLib</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_CppUnit\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_CppUnit\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CppUnit-debug</TargetName>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CppUnit</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)$(TargetName).lib  </OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\tests\CppUnit\textui\TableTestResult.cpp" />
+    <ClCompile Include="..\tests\CppUnit\framework\TestCase.cpp" />
+    <ClCompile Include="..\tests\CppUnit\framework\TestFailure.cpp" />
+    <ClCompile Include="..\tests\CppUnit\framework\TestResult.cpp" />
+    <ClCompile Include="..\tests\CppUnit\TestRunner.cpp" />
+    <ClCompile Include="..\tests\CppUnit\framework\TestSuite.cpp" />
+    <ClCompile Include="..\tests\CppUnit\textui\TextTestResult.cpp" />
+    <ClCompile Include="..\tests\CppUnit\textui\XmlTestResult.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\tests\CppUnit\TestRunner.hpp" />
+    <ClInclude Include="..\tests\CppUnit\framework\CppUnitException.h" />
+    <ClInclude Include="..\tests\CppUnit\framework\estring.h" />
+    <ClInclude Include="..\tests\CppUnit\framework\Guards.h" />
+    <ClInclude Include="..\tests\CppUnit\textui\TableTestResult.hpp" />
+    <ClInclude Include="..\tests\CppUnit\framework\Test.h" />
+    <ClInclude Include="..\tests\CppUnit\framework\TestCaller.h" />
+    <ClInclude Include="..\tests\CppUnit\framework\TestCase.h" />
+    <ClInclude Include="..\tests\CppUnit\framework\TestFailure.h" />
+    <ClInclude Include="..\tests\CppUnit\framework\TestResult.h" />
+    <ClInclude Include="..\tests\CppUnit\framework\TestSuite.h" />
+    <ClInclude Include="..\tests\CppUnit\textui\TextTestResult.h" />
+    <ClInclude Include="..\tests\CppUnit\textui\XmlTestResult.hpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/vs10/test_DOM.vcxproj b/vs10/test_DOM.vcxproj
index 8cab246b..8c7ca79d 100644
--- a/vs10/test_DOM.vcxproj
+++ b/vs10/test_DOM.vcxproj
@@ -44,6 +44,7 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_DOM\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <TargetName>DOM_test</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -68,12 +69,12 @@
       <Culture>0x0809</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)DOM_test.exe</OutputFile>
+      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)DOM_test.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -104,8 +105,8 @@
       <Culture>0x0809</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)DOM_test.exe</OutputFile>
+      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -114,18 +115,9 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\tests\CppUnit\textui\XmlTestResult.cpp" />
     <ClCompile Include="..\tests\DOM\main.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\TableTestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestCase.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestFailure.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\TestRunner.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestSuite.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\TextTestResult.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\tests\CppUnit\textui\XmlTestResult.hpp" />
     <ClInclude Include="..\tests\DOM\dom_test_suite.hpp" />
     <ClInclude Include="..\tests\DOM\test_Attribute.hpp" />
     <ClInclude Include="..\tests\DOM\test_CDATA.hpp" />
@@ -141,18 +133,6 @@
     <ClInclude Include="..\tests\DOM\test_Siblings.hpp" />
     <ClInclude Include="..\tests\DOM\test_Text.hpp" />
     <ClInclude Include="..\tests\DOM\test_TreeWalker.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\CppUnitException.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\estring.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\Guards.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TableTestResult.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\Test.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCaller.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCase.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestFailure.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestResult.h" />
-    <ClInclude Include="..\tests\CppUnit\TestRunner.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestSuite.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TextTestResult.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="lib_arabica.vcxproj">
diff --git a/vs10/test_DOM_silly.vcxproj b/vs10/test_DOM_silly.vcxproj
index 3a09323d..cc6ced71 100644
--- a/vs10/test_DOM_silly.vcxproj
+++ b/vs10/test_DOM_silly.vcxproj
@@ -44,6 +44,7 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_DOM_silly\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <TargetName>DOM_test_silly</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -68,8 +69,8 @@
       <Culture>0x0809</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)DOM_test_silly.exe</OutputFile>
+      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -103,10 +104,10 @@
       <Culture>0x0809</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)DOM_test_silly.exe</OutputFile>
+      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ProgramDatabaseFile>.\Release_test_DOM/DOM_test_silly.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>.\Release_test_DOM/$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -114,19 +115,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\tests\CppUnit\textui\XmlTestResult.cpp" />
     <ClCompile Include="..\tests\DOM\main_silly.cpp" />
     <ClCompile Include="..\tests\silly_string\silly_string.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\TableTestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestCase.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestFailure.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\TestRunner.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestSuite.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\TextTestResult.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\tests\CppUnit\textui\XmlTestResult.hpp" />
     <ClInclude Include="..\tests\Dom\dom_test_suite.hpp" />
     <ClInclude Include="..\tests\silly_string\silly_string.hpp" />
     <ClInclude Include="..\tests\Dom\test_Attribute.hpp" />
@@ -141,18 +133,6 @@
     <ClInclude Include="..\tests\Dom\test_SAX2DOM.hpp" />
     <ClInclude Include="..\tests\Dom\test_Siblings.hpp" />
     <ClInclude Include="..\tests\Dom\test_Text.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\CppUnitException.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\estring.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\Guards.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TableTestResult.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\Test.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCaller.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCase.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestFailure.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestResult.h" />
-    <ClInclude Include="..\tests\CppUnit\TestRunner.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestSuite.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TextTestResult.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="lib_arabica.vcxproj">
diff --git a/vs10/test_DOM_wide.vcxproj b/vs10/test_DOM_wide.vcxproj
index f27b6881..9bcb44d3 100644
--- a/vs10/test_DOM_wide.vcxproj
+++ b/vs10/test_DOM_wide.vcxproj
@@ -44,6 +44,7 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_DOM_wide\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <TargetName>DOM_test_wide</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -68,12 +69,12 @@
       <Culture>0x0809</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)DOM_test_wide.exe</OutputFile>
+      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)DOM_test_wide.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -104,8 +105,8 @@
       <Culture>0x0809</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)DOM_test_wide.exe</OutputFile>
+      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -114,18 +115,9 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\tests\CppUnit\textui\XmlTestResult.cpp" />
     <ClCompile Include="..\tests\DOM\main_wide.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\TableTestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestCase.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestFailure.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\TestRunner.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestSuite.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\TextTestResult.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\tests\CppUnit\textui\XmlTestResult.hpp" />
     <ClInclude Include="..\tests\DOM\dom_test_suite.hpp" />
     <ClInclude Include="..\tests\Dom\test_Attribute.hpp" />
     <ClInclude Include="..\tests\Dom\test_CDATA.hpp" />
@@ -139,18 +131,6 @@
     <ClInclude Include="..\tests\Dom\test_SAX2DOM.hpp" />
     <ClInclude Include="..\tests\Dom\test_Siblings.hpp" />
     <ClInclude Include="..\tests\Dom\test_Text.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\CppUnitException.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\estring.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\Guards.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TableTestResult.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\Test.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCaller.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCase.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestFailure.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestResult.h" />
-    <ClInclude Include="..\tests\CppUnit\TestRunner.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestSuite.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TextTestResult.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="lib_arabica.vcxproj">
diff --git a/vs10/test_SAX_filter.vcxproj b/vs10/test_SAX_filter.vcxproj
index 2010ff7b..dec13570 100644
--- a/vs10/test_SAX_filter.vcxproj
+++ b/vs10/test_SAX_filter.vcxproj
@@ -44,6 +44,7 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_SAXFilter\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <TargetName>sax_filter_test</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -71,11 +72,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)sax_filter_test.exe</OutputFile>
+      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)sax_filter_test.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -106,8 +107,8 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)sax_filter_test.exe</OutputFile>
+      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -117,27 +118,8 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\tests\Sax\filter_test.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\TableTestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestCase.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestFailure.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\TestRunner.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestSuite.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\TextTestResult.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\tests\CppUnit\framework\CppUnitException.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\estring.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\Guards.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TableTestResult.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\Test.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCaller.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCase.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestFailure.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestResult.h" />
-    <ClInclude Include="..\tests\CppUnit\TestRunner.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestSuite.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TextTestResult.h" />
     <ClInclude Include="..\tests\Sax\test_WhitespaceStripper.hpp" />
   </ItemGroup>
   <ItemGroup>
diff --git a/vs10/test_SAX_filter_silly.vcxproj b/vs10/test_SAX_filter_silly.vcxproj
index a1243d38..c5f5a4ba 100644
--- a/vs10/test_SAX_filter_silly.vcxproj
+++ b/vs10/test_SAX_filter_silly.vcxproj
@@ -44,6 +44,7 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_SAXFilter_silly\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <TargetName>sax_filter_test_silly</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -70,11 +71,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)sax_filter_test_ss.exe</OutputFile>
+      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)sax_filter_test_ss.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -104,8 +105,8 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)sax_filter_test_ss.exe</OutputFile>
+      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -114,30 +115,9 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\tests\CppUnit\textui\XmlTestResult.cpp" />
     <ClCompile Include="..\tests\Sax\filter_test_silly.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\TableTestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestCase.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestFailure.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\TestRunner.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestSuite.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\TextTestResult.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\tests\CppUnit\framework\CppUnitException.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\estring.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\Guards.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TableTestResult.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\Test.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCaller.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCase.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestFailure.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestResult.h" />
-    <ClInclude Include="..\tests\CppUnit\TestRunner.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestSuite.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TextTestResult.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\XmlTestResult.hpp" />
     <ClInclude Include="..\tests\Sax\test_WhitespaceStripper.hpp" />
   </ItemGroup>
   <ItemGroup>
diff --git a/vs10/test_SAX_filter_wide.vcxproj b/vs10/test_SAX_filter_wide.vcxproj
index 6b6049ed..57eed135 100644
--- a/vs10/test_SAX_filter_wide.vcxproj
+++ b/vs10/test_SAX_filter_wide.vcxproj
@@ -44,6 +44,7 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_SAXFilter_wide\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <TargetName>sax_filter_test_wide</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -70,11 +71,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)sax_filter_test_wide.exe</OutputFile>
+      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)sax_filter_test_wide.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -104,8 +105,8 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)sax_filter_test_wide.exe</OutputFile>
+      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -114,30 +115,9 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\tests\CppUnit\textui\XmlTestResult.cpp" />
     <ClCompile Include="..\tests\Sax\filter_test_wide.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\TableTestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestCase.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestFailure.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\TestRunner.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestSuite.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\TextTestResult.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\tests\CppUnit\framework\CppUnitException.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\estring.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\Guards.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TableTestResult.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\Test.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCaller.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCase.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestFailure.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestResult.h" />
-    <ClInclude Include="..\tests\CppUnit\TestRunner.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestSuite.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TextTestResult.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\XmlTestResult.hpp" />
     <ClInclude Include="..\tests\Sax\test_WhitespaceStripper.hpp" />
   </ItemGroup>
   <ItemGroup>
diff --git a/vs10/test_utils.vcxproj b/vs10/test_utils.vcxproj
index a8e7f55e..038465de 100644
--- a/vs10/test_utils.vcxproj
+++ b/vs10/test_utils.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -43,6 +43,7 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_utils\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <TargetName>utils_test</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -64,10 +65,10 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)utils_test.exe</OutputFile>
+      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)utils_test.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -91,8 +92,8 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)utils_test.exe</OutputFile>
+      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -104,36 +105,15 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\tests\CppUnit\textui\XmlTestResult.cpp" />
     <ClCompile Include="..\tests\Utils\utils_test.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\TableTestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestCase.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestFailure.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\TestRunner.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestSuite.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\TextTestResult.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\tests\CppUnit\textui\XmlTestResult.hpp" />
     <ClInclude Include="..\tests\Utils\test_base64.hpp" />
     <ClInclude Include="..\tests\Utils\test_normalize_whitespace.hpp" />
     <ClInclude Include="..\tests\Utils\test_qname.hpp" />
     <ClInclude Include="..\tests\Utils\test_uri.hpp" />
     <ClInclude Include="..\tests\Utils\test_xml_strings.hpp" />
     <ClInclude Include="..\tests\Utils\util_test_suite.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\CppUnitException.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\estring.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\Guards.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TableTestResult.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\Test.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCaller.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCase.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestFailure.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestResult.h" />
-    <ClInclude Include="..\tests\CppUnit\TestRunner.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestSuite.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TextTestResult.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="lib_arabica.vcxproj">
diff --git a/vs10/test_xpath.vcxproj b/vs10/test_xpath.vcxproj
index c3262e62..13b68fb9 100644
--- a/vs10/test_xpath.vcxproj
+++ b/vs10/test_xpath.vcxproj
@@ -66,10 +66,10 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)xpath_test.exe</OutputFile>
+      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)xpath_test.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -93,8 +93,8 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)xpath_test.exe</OutputFile>
+      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -107,14 +107,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\tests\XPath\main.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\TableTestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestCase.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestFailure.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\TestRunner.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestSuite.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\TextTestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\XmlTestResult.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\tests\XPath\arithmetic_test.hpp" />
@@ -131,19 +123,6 @@
     <ClInclude Include="..\tests\XPath\text_node_test.hpp" />
     <ClInclude Include="..\tests\XPath\value_test.hpp" />
     <ClInclude Include="..\tests\XPath\xpath_test_suite.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\CppUnitException.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\estring.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\Guards.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TableTestResult.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\Test.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCaller.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCase.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestFailure.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestResult.h" />
-    <ClInclude Include="..\tests\CppUnit\TestRunner.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestSuite.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TextTestResult.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\XmlTestResult.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="lib_arabica.vcxproj">
diff --git a/vs10/test_xpath_silly.vcxproj b/vs10/test_xpath_silly.vcxproj
index 53c16c3f..afd37382 100644
--- a/vs10/test_xpath_silly.vcxproj
+++ b/vs10/test_xpath_silly.vcxproj
@@ -43,6 +43,7 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_xpath_silly\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <TargetName>xpath_test_silly</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -64,10 +65,10 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)xpath_test_ss.exe</OutputFile>
+      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)xpath_test_ss.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -91,8 +92,8 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)xpath_test_ss.exe</OutputFile>
+      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -104,19 +105,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\tests\CppUnit\textui\XmlTestResult.cpp" />
     <ClCompile Include="..\tests\XPath\main_silly.cpp" />
     <ClCompile Include="..\tests\silly_string\silly_string.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\TableTestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestCase.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestFailure.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\TestRunner.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestSuite.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\TextTestResult.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\tests\CppUnit\textui\XmlTestResult.hpp" />
     <ClInclude Include="..\tests\XPath\arithmetic_test.hpp" />
     <ClInclude Include="..\tests\XPath\attr_value_test.hpp" />
     <ClInclude Include="..\tests\XPath\axis_enumerator_test.hpp" />
@@ -131,18 +123,6 @@
     <ClInclude Include="..\tests\XPath\step_test.hpp" />
     <ClInclude Include="..\tests\XPath\value_test.hpp" />
     <ClInclude Include="..\tests\XPath\xpath_test_suite.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\CppUnitException.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\estring.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\Guards.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TableTestResult.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\Test.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCaller.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCase.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestFailure.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestResult.h" />
-    <ClInclude Include="..\tests\CppUnit\TestRunner.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestSuite.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TextTestResult.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="lib_arabica.vcxproj">
diff --git a/vs10/test_xpath_wide.vcxproj b/vs10/test_xpath_wide.vcxproj
index f7ba9a38..f4c6c6b0 100644
--- a/vs10/test_xpath_wide.vcxproj
+++ b/vs10/test_xpath_wide.vcxproj
@@ -43,6 +43,7 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_xpath_wide\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <TargetName>xpath_test_wide</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -64,10 +65,10 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)xpath_test_wide.exe</OutputFile>
+      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)xpath_test_wide.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -91,8 +92,8 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)xpath_test_wide.exe</OutputFile>
+      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -104,18 +105,9 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\tests\CppUnit\textui\XmlTestResult.cpp" />
     <ClCompile Include="..\tests\XPath\main_wide.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\TableTestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestCase.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestFailure.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\TestRunner.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestSuite.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\TextTestResult.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\tests\CppUnit\textui\XmlTestResult.hpp" />
     <ClInclude Include="..\tests\XPath\arithmetic_test.hpp" />
     <ClInclude Include="..\tests\XPath\attr_value_test.hpp" />
     <ClInclude Include="..\tests\XPath\axis_enumerator_test.hpp" />
@@ -129,18 +121,6 @@
     <ClInclude Include="..\tests\XPath\step_test.hpp" />
     <ClInclude Include="..\tests\XPath\value_test.hpp" />
     <ClInclude Include="..\tests\XPath\xpath_test_suite.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\CppUnitException.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\estring.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\Guards.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TableTestResult.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\Test.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCaller.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCase.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestFailure.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestResult.h" />
-    <ClInclude Include="..\tests\CppUnit\TestRunner.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestSuite.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TextTestResult.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="lib_arabica.vcxproj">
diff --git a/vs10/test_xslt.vcxproj b/vs10/test_xslt.vcxproj
index d7e7737f..dcd572ff 100644
--- a/vs10/test_xslt.vcxproj
+++ b/vs10/test_xslt.vcxproj
@@ -66,10 +66,10 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\lib\arabica-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)xslt_test.exe</OutputFile>
+      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)xslt_test.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -93,8 +93,8 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\lib\arabica.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)xslt_test.exe</OutputFile>
+      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>
@@ -110,30 +110,9 @@
   <ItemGroup>
     <ClCompile Include="..\tests\Xslt\main.cpp" />
     <ClCompile Include="..\tests\XSLT\xslt_test.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\TableTestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestCase.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestFailure.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\TestRunner.cpp" />
-    <ClCompile Include="..\tests\CppUnit\framework\TestSuite.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\TextTestResult.cpp" />
-    <ClCompile Include="..\tests\CppUnit\textui\XmlTestResult.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\tests\Xslt\xslt_test.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\CppUnitException.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\estring.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\Guards.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TableTestResult.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\Test.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCaller.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestCase.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestFailure.h" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestResult.h" />
-    <ClInclude Include="..\tests\CppUnit\TestRunner.hpp" />
-    <ClInclude Include="..\tests\CppUnit\framework\TestSuite.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\TextTestResult.h" />
-    <ClInclude Include="..\tests\CppUnit\textui\XmlTestResult.hpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\tests\XSLT\testsuite\TESTS\arabica-catalog.xml" />