diff --git a/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.2010.csproj b/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.2010.csproj
index cbf24960..5baf2b56 100644
--- a/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.2010.csproj
+++ b/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.2010.csproj
@@ -56,6 +56,7 @@
     <Compile Include="Template\Velocity\Config\TemplateNamespaceParserTests.cs" />
     <Compile Include="Template\Velocity\VelocityEngineFactoryObjectTests.cs" />
     <Compile Include="Template\Velocity\VelocityEngineTestBase.cs" />
+    <Compile Include="VelocityCompilerOptionsTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj">
@@ -83,8 +84,7 @@
     <None Include="Template\Velocity\config.properties">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <EmbeddedResource Include="Template\Velocity\EmbeddedTemplate.vm">
-    </EmbeddedResource>
+    <EmbeddedResource Include="Template\Velocity\EmbeddedTemplate.vm" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
diff --git a/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build b/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build
index 4e8e9251..341aedb3 100644
--- a/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build
+++ b/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build
@@ -29,12 +29,12 @@
 				<include name="Nvelocity.dll" />
 				<exclude name="${project::get-name()}.dll" />
 			</references>
-			<resources basedir="." prefix="Spring.Template.Velocity.Tests" dynamicprefix="true" failonempty="true">
+			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
 				<include name="**/*.xml" />
 				<include name="**/*.xsd" />
-			        <include name="**/*.test" />
-			        <include name="**/*.vm" />
-			        <include name="**/*.properties" />
+			  <include name="**/*.test" />
+			  <include name="**/*.vm" />
+			  <include name="**/*.properties" />
 				<include name="**/*.config" />
 			</resources>
 		</csc>
diff --git a/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.csproj b/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.csproj
index fffa3de6..5f63a339 100644
--- a/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.csproj
+++ b/test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.csproj
@@ -53,6 +53,7 @@
     <Compile Include="Template\Velocity\Config\TemplateNamespaceParserTests.cs" />
     <Compile Include="Template\Velocity\VelocityEngineFactoryObjectTests.cs" />
     <Compile Include="Template\Velocity\VelocityEngineTestBase.cs" />
+    <Compile Include="VelocityCompilerOptionsTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
diff --git a/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/Config/TemplateNamespaceParserTests.cs b/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/Config/TemplateNamespaceParserTests.cs
index 9a207f66..a70bb21e 100644
--- a/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/Config/TemplateNamespaceParserTests.cs
+++ b/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/Config/TemplateNamespaceParserTests.cs
@@ -34,7 +34,7 @@ using Spring.Template.Velocity.Config;
 
 #endregion
 
-namespace Spring.Template.Velocity.Tests.Template.Velocity.Config {
+namespace Spring.Template.Velocity.Config {
     /// <summary>
     ///  This class contains tests for the template namespace configuration parser
     /// </summary>
@@ -90,7 +90,7 @@ namespace Spring.Template.Velocity.Tests.Template.Velocity.Config {
             Assert.AreEqual(DEFAULT_CACHE_SIZE, velocityEngine.GetProperty(RuntimeConstants.RESOURCE_MANAGER_DEFAULTCACHE_SIZE), "incorrect default cache size");
             Assert.AreEqual(DEFAULT_CACHE_FLAG, velocityEngine.GetProperty(VelocityConstants.Assembly + VelocityConstants.Separator + PropertyResourceLoaderCachce),
                             "incorrect caching flag");
-            AssertMergedValue(velocityEngine, "Spring.Template.Velocity.Tests.Template.Velocity.SimpleTemplate.vm");
+            AssertMergedValue(velocityEngine, "Spring.Template.Velocity.SimpleTemplate.vm");
         }
 
         /// <summary>
@@ -155,7 +155,7 @@ namespace Spring.Template.Velocity.Tests.Template.Velocity.Config {
 
             Assert.AreEqual(PropertyMyResourceLoader, getSingleProperty(velocityEngine, RuntimeConstants.RESOURCE_LOADER), "incorrect resource loader");
             
-            Assert.AreEqual("Spring.Template.Velocity.Tests.Template.Velocity.Config.TestCustomResourceLoader; Spring.Template.Velocity.Tests",
+            Assert.AreEqual("Spring.Template.Velocity.Config.TestCustomResourceLoader; Spring.Template.Velocity.Tests",
                 getSingleProperty(velocityEngine, classProp), "incorrect resource loader type");
             Assert.AreEqual(PropertyMyResourceLoader, getSingleProperty(velocityEngine, RuntimeConstants.RESOURCE_LOADER), "incorrect resource loader");
             Assert.AreEqual("A custom resource loader",
diff --git a/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineFactoryObjectTests.cs b/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineFactoryObjectTests.cs
index 409aacff..bb6bfd45 100644
--- a/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineFactoryObjectTests.cs
+++ b/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineFactoryObjectTests.cs
@@ -29,7 +29,7 @@ using NVelocity.Exception;
 
 #endregion
 
-namespace Spring.Template.Velocity.Tests.Template.Velocity {
+namespace Spring.Template.Velocity {
 
     /// <summary>
     /// This class contains tests for VelocityEngineFactoryObject
@@ -45,7 +45,7 @@ namespace Spring.Template.Velocity.Tests.Template.Velocity {
         public void TestMergeUsingAssembly() {
             VelocityEngine velocityEngine = appContext.GetObject("assemblyBasedVelocityEngine") as VelocityEngine;
             Assert.IsNotNull(velocityEngine, "velocityEngine is null");
-            AssertMergedValue(velocityEngine, "Spring.Template.Velocity.Tests.Template.Velocity.SimpleTemplate.vm");
+            AssertMergedValue(velocityEngine, "Spring.Template.Velocity.SimpleTemplate.vm");
          }
 
         /// <summary>
@@ -108,7 +108,7 @@ namespace Spring.Template.Velocity.Tests.Template.Velocity {
             VelocityEngine velocityEngine =
                 appContext.GetObject("propertiesFileBasedVelocityEngine") as VelocityEngine;
             Assert.IsNotNull(velocityEngine, "velocityEngine is null");
-            AssertMergedValue(velocityEngine, "Spring.Template.Velocity.Tests.Template.Velocity.SimpleTemplate.vm");
+            AssertMergedValue(velocityEngine, "Spring.Template.Velocity.SimpleTemplate.vm");
         }
 
         /// <summary>
diff --git a/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineFactoryObjectTests.xml b/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineFactoryObjectTests.xml
index dd108bdf..28cc9f91 100644
--- a/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineFactoryObjectTests.xml
+++ b/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineFactoryObjectTests.xml
@@ -17,7 +17,7 @@
     <nv:engine id="cnSpringVelocityEngine" prefer-file-system-access="false">
         <nv:resource-loader default-cache-size="200" modification-check-interval="30" template-caching="true">
             <nv:spring uri="file://Template/Velocity/"/>
-            <nv:spring uri="assembly://Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.Template.Velocity/"/>
+            <nv:spring uri="assembly://Spring.Template.Velocity.Tests/Spring.Template.Velocity/"/>
         </nv:resource-loader>
     </nv:engine>
 
@@ -34,7 +34,7 @@
         <nv:resource-loader default-cache-size="200" modification-check-interval="30" template-caching="true">
             <nv:custom name="myResourceLoader"
                        description="A custom resource loader"
-                       type="Spring.Template.Velocity.Tests.Template.Velocity.Config.TestCustomResourceLoader, Spring.Template.Velocity.Tests"
+                       type="Spring.Template.Velocity.Config.TestCustomResourceLoader, Spring.Template.Velocity.Tests"
                        path="Template/Velocity/"/>
         </nv:resource-loader>
     </nv:engine>
@@ -68,7 +68,7 @@
 
     <!-- Spring based defualt file fallback to spring definition -->
     <object id="springFallbackVelocityEngine" type="Spring.Template.Velocity.VelocityEngineFactoryObject, Spring.Template.Velocity" >
-        <property name="ResourceLoaderPath " value="assembly://Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.Template.Velocity/" />
+        <property name="ResourceLoaderPath " value="assembly://Spring.Template.Velocity.Tests/Spring.Template.Velocity/" />
     </object>
 
 
diff --git a/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineTestBase.cs b/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineTestBase.cs
index 6c1cc980..0a441e41 100644
--- a/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineTestBase.cs
+++ b/test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineTestBase.cs
@@ -29,7 +29,7 @@ using Spring.Objects.Factory.Xml;
 
 #endregion
 
-namespace Spring.Template.Velocity.Tests.Template.Velocity {
+namespace Spring.Template.Velocity {
 
     /// <summary>
     /// Base class for Velocity engine tests.