diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/MultipleDbTests.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/MultipleDbTests.cs
index a805dd6f..c792f32a 100644
--- a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/MultipleDbTests.cs
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/MultipleDbTests.cs
@@ -1,7 +1,7 @@
 #region License
 
 /*
- * Copyright © 2002-2005 the original author or authors.
+ * Copyright © 2002-2009 the original author or authors.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,18 +20,13 @@
 
 #region Imports
 
-using System;
 using log4net;
 using log4net.Config;
 using NHibernate;
 using NUnit.Framework;
 using Spring.Context;
 using Spring.Context.Support;
-using Spring.Data.Common;
 using Spring.Data.NHibernate.Support;
-using Spring.Data.Support;
-using Spring.Transaction;
-using Spring.Transaction.Support;
 
 #endregion
 
@@ -87,6 +82,7 @@ namespace Spring.Data.NHibernate
 
         }
 
+        // TODO: this test fails - check out why
         [Test]
         public void MultipleDBAccess()
         {
diff --git a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/MultipleDbTests.xml b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/MultipleDbTests.xml
index b3ddd4cf..108b6758 100644
--- a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/MultipleDbTests.xml
+++ b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/MultipleDbTests.xml
@@ -4,11 +4,11 @@
 
   <db:provider id="DbProvider1" 
                  provider="SqlServer-1.1" 
-                 connectionString="Data Source=(local);Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
+                 connectionString="Data Source=MARKT60\SQL2005;Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
 
   <db:provider id="DbProvider2" 
                  provider="SqlServer-1.1" 
-                 connectionString="Data Source=(local);Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
+                 connectionString="Data Source=MARKT60\SQL2005;Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
 
   <object id="SessionFactory1" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate21">
 
diff --git a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/NHDAOTests.xml b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/NHDAOTests.xml
index 7917fc27..815c75c9 100644
--- a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/NHDAOTests.xml
+++ b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/NHDAOTests.xml
@@ -4,7 +4,7 @@
 
   <db:provider id="DbProvider"
                provider="SqlServer-1.1"
-               connectionString="Data Source=(local);Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
+               connectionString="Data Source=MARKT60\SQL2005;Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
 
   <!--
   <db:provider id="DbProvider" 
diff --git a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/dbProviderTemplateTests.xml b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/dbProviderTemplateTests.xml
index 1b8107be..f659ec40 100644
--- a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/dbProviderTemplateTests.xml
+++ b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/dbProviderTemplateTests.xml
@@ -2,18 +2,18 @@
 <objects xmlns='http://www.springframework.net'
          xmlns:db="http://www.springframework.net/database">
 
+<!--
   <db:provider id="DbProvider"
                  provider="SqlServer-1.1"
-                 connectionString="Data Source=(local);Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
+                 connectionString="Data Source=MARKT60\SQL2005;Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
+-->
 
-
-  <!--
   <object id="DbProvider" type="Spring.Data.Common.UserCredentialsDbProvider, Spring.Data">
     <property name="TargetDbProvider" ref="targetDbProvider"/>
     <property name="Username" value="User ID=defaultName"/>
     <property name="Password" value="Password=defaultPass"/>
   </object>
--->
+
   <db:provider id="targetDbProvider" 
                provider="SqlServer-2.0"
                connectionString="Data Source=MARKT60\SQL2005;Trusted_Connection=False"/>
diff --git a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/templateTests.xml b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/templateTests.xml
index 70db836e..b6cc70a6 100644
--- a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/templateTests.xml
+++ b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Data/NHibernate/templateTests.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" ?> 
+<?xml version="1.0" encoding="utf-8" ?>
 <objects xmlns='http://www.springframework.net'
 		 xmlns:db="http://www.springframework.net/database">
 
 
-    <db:provider   id="DbProvider"  
-                   provider="SqlServer-1.1" 
-                   connectionString="Data Source=(local);Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
-                   <!--
+  <db:provider   id="DbProvider"
+                 provider="SqlServer-1.1"
+                 connectionString="Data Source=MARKT60\SQL2005;Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
+  <!--
                    connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Spring;User ID=springqa; Password=springqa"/>
                    -->
-                   <!--                   
+  <!--                   
     <db:provider id="DbProvider" 
                    provider="OracleODP-2.0" 
                    connectionString="Data Source=AGORA; User Id=agora_user; Password=welcome_bad"/>
@@ -21,24 +21,24 @@
              -->
 
   <object id="SessionFactory" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate21">
-        <!-- TODO Provide dedicated NHibernate Schema -->
-        <property name="DbProvider" ref="DbProvider"/>
-        <property name="MappingResources">
-          <list>
-            <value>assembly://Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate/TestObject.hbm.xml</value>
-          </list>
-        </property>
-        <!--
+    <!-- TODO Provide dedicated NHibernate Schema -->
+    <property name="DbProvider" ref="DbProvider"/>
+    <property name="MappingResources">
+      <list>
+        <value>assembly://Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate/TestObject.hbm.xml</value>
+      </list>
+    </property>
+    <!--
         <property name="MappingAssemblies">
             <list>
                 <value>Spring.Data.NHibernate.Integration.Tests</value>
             </list>
         </property>
         -->
-        <property name="HibernateProperties">
-           <dictionary>
+    <property name="HibernateProperties">
+      <dictionary>
 
-             <!--
+        <!--
              <entry key="hibernate.connection.provider"
                        value="NHibernate.Connection.DriverConnectionProvider"/>
 
@@ -46,60 +46,76 @@
                     value="NHibernate.Dialect.Oracle9Dialect"/>
              -->
 
-             
-                <entry key="dialect"
-                       value="NHibernate.Dialect.MsSql2000Dialect"/>
-                     
-                <entry key="connection.driver_class"
-                       value="NHibernate.Driver.SqlClientDriver"/>
 
-               <entry key="proxyfactory.factory_class"
-                       value="NHibernate.ByteCode.Castle.ProxyFactoryFactory, NHibernate.ByteCode.Castle"/>
+        <entry key="dialect"
+               value="NHibernate.Dialect.MsSql2000Dialect"/>
 
-           </dictionary>
-        </property>
-                      
-    </object>
+        <entry key="connection.driver_class"
+               value="NHibernate.Driver.SqlClientDriver"/>
 
-    <object id="nativeNHTestObjectDao" type="Spring.Data.NHibernate.NativeNHTestObjectDao, Spring.Data.NHibernate21.Integration.Tests">
+        <entry key="proxyfactory.factory_class"
+                value="NHibernate.ByteCode.Castle.ProxyFactoryFactory, NHibernate.ByteCode.Castle"/>
+
+      </dictionary>
+    </property>
+
+  </object>
+
+  <object id="nativeNHTestObjectDao" type="Spring.Data.NHibernate.NativeNHTestObjectDao, Spring.Data.NHibernate21.Integration.Tests">
+    <property name="SessionFactory" ref="SessionFactory"/>
+  </object>
+
+  <object id="NHTestObjectDao" type="Spring.Data.NHibernate.NHTestObjectDao, Spring.Data.NHibernate21.Integration.Tests">
+    <property name="SessionFactory" ref="SessionFactory"/>
+  </object>
+
+  <object id="hibernateTransactionManager"
+          type="Spring.Data.NHibernate.HibernateTransactionManager, Spring.Data.NHibernate21">
+
+    <property name="DbProvider" ref="DbProvider"/>
+    <property name="sessionFactory" ref="SessionFactory"/>
+
+  </object>
+
+  <!-- Transactional Proxy for TestObjectDao using transaction attributes -->
+  <object id="testObjectDaoViaTxAttributes"
+          type="Spring.Transaction.Interceptor.TransactionProxyFactoryObject, Spring.Data">
+
+    <property name="PlatformTransactionManager" ref="hibernateTransactionManager"/>
+    <property name="Target">
+      <object type="Spring.Data.NHibernate.NHTestObjectDao">
         <property name="SessionFactory" ref="SessionFactory"/>
-    </object>
-        
-    <object id="NHTestObjectDao" type="Spring.Data.NHibernate.NHTestObjectDao, Spring.Data.NHibernate21.Integration.Tests">
+      </object>
+    </property>
+
+    <property name="ProxyInterfaces" value="Spring.Data.NHibernate.ITestObjectDao"/>
+
+    <property name="TransactionAttributeSource">
+      <object type="Spring.Transaction.Interceptor.AttributesTransactionAttributeSource" />
+    </property>
+  </object>
+
+  <!-- Transactional Proxy for TestObjectDao using the TransactionProxyFactory -->
+  <object id="testObjectDaoTransProxy"
+          type="Spring.Transaction.Interceptor.TransactionProxyFactoryObject, Spring.Data">
+
+    <property name="PlatformTransactionManager" ref="hibernateTransactionManager"/>
+    <property name="Target">
+      <object type="Spring.Data.NHibernate.NHTestObjectDao, Spring.Data.NHibernate21.Integration.Tests">
         <property name="SessionFactory" ref="SessionFactory"/>
-    </object>
-    
-    <object id="hibernateTransactionManager" 
-            type="Spring.Data.NHibernate.HibernateTransactionManager, Spring.Data.NHibernate21">
-            
-        <property name="DbProvider" ref="DbProvider"/>
-        <property name="sessionFactory" ref="SessionFactory"/>
+      </object>
+    </property>
 
-    </object>
-    
+    <property name="ProxyInterfaces" value="Spring.Data.NHibernate.ITestObjectDao"/>
+
+    <property name="TransactionAttributes">
+      <name-values>
+        <add key="Create*" value="PROPAGATION_REQUIRED"/>
+        <add key="Delete*" value="PROPAGATION_REQUIRED"/>
+        <add key="Update*" value="PROPAGATION_REQUIRED"/>
+        <add key="Find*" value="PROPAGATION_REQUIRED"/>
+      </name-values>
+    </property>
+  </object>
 
-       
-    <!-- Transactional Proxy for TestObjectDao using the TransactionProxyFactory -->
-    <object id="testObjectDaoTransProxy" 
-            type="Spring.Transaction.Interceptor.TransactionProxyFactoryObject, Spring.Data">
-        
-        <property name="PlatformTransactionManager" ref="hibernateTransactionManager"/>
-        <property name="Target">
-            <object type="Spring.Data.NHibernate.NHTestObjectDao, Spring.Data.NHibernate21.Integration.Tests">
-                <property name="SessionFactory" ref="SessionFactory"/>
-            </object>            
-        </property>
-        
-        <property name="ProxyInterfaces" value="Spring.Data.NHibernate.ITestObjectDao"/>
-        
-        <property name="TransactionAttributes">
-            <name-values>
-                <add key="Create*" value="PROPAGATION_REQUIRED"/>
-                <add key="Delete*" value="PROPAGATION_REQUIRED"/>
-                <add key="Update*" value="PROPAGATION_REQUIRED"/>
-                <add key="Find*" value="PROPAGATION_REQUIRED"/>
-            </name-values>
-        </property>
-    </object>    
-    
 </objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.2008.csproj b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.2008.csproj
index 8df8a0b5..996d2612 100644
--- a/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.2008.csproj
+++ b/test/Spring/Spring.Data.NHibernate21.Integration.Tests/Spring.Data.NHibernate21.Integration.Tests.2008.csproj
@@ -146,15 +146,17 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Data\NHibernate\Credit.hbm.xml" />
-    <EmbeddedResource Include="Data\NHibernate\dbProviderTemplateTests.xml" />
     <EmbeddedResource Include="Data\NHibernate\Debit.hbm.xml" />
     <EmbeddedResource Include="Data\NHibernate\MultipleDbTests.xml" />
-    <EmbeddedResource Include="Data\NHibernate\templateTests.xml" />
     <EmbeddedResource Include="Data\NHibernate\TestObject.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Data\NHibernate\NHDAOTests.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\NHibernate\dbProviderTemplateTests.xml" />
+    <EmbeddedResource Include="Data\NHibernate\templateTests.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.