diff --git a/src/Spring/Spring.Messaging/Messaging/Support/MessageQueueFactoryObject.cs b/src/Spring/Spring.Messaging/Messaging/Support/MessageQueueFactoryObject.cs
index 209cc937..621a06c3 100644
--- a/src/Spring/Spring.Messaging/Messaging/Support/MessageQueueFactoryObject.cs
+++ b/src/Spring/Spring.Messaging/Messaging/Support/MessageQueueFactoryObject.cs
@@ -168,6 +168,7 @@ namespace Spring.Messaging.Support
             }
             else
             {
+                // TODO (EE): is it really a good idea to set a global property from within an instance?
                 MessageQueue.EnableConnectionCache = enableConnectionCache;
                 MessageQueue mq = new MessageQueue(Path, DenySharedReceive, EnableCache, AccessMode);
                 if (messageReadPropertyFilterSetDefaults)
diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Core/MessageQueueTemplateTests.cs b/test/Spring/Spring.Messaging.Tests/Messaging/Core/MessageQueueTemplateTests.cs
index 08255f58..9f011e54 100644
--- a/test/Spring/Spring.Messaging.Tests/Messaging/Core/MessageQueueTemplateTests.cs
+++ b/test/Spring/Spring.Messaging.Tests/Messaging/Core/MessageQueueTemplateTests.cs
@@ -40,10 +40,40 @@ namespace Spring.Messaging.Core
     /// This class contains tests for 
     /// </summary>
     /// <author>Mark Pollack</author>
-    /// <version>$Id:$</version>
     [TestFixture]
     public class MessageQueueTemplateTests : AbstractDependencyInjectionSpringContextTests
     {
+        [SetUp]
+        public override void SetUp()
+        {
+            RecreateMessageQueue(@".\Private$\testqueue", false);
+            RecreateMessageQueue(@".\Private$\testtxqueue", true);
+            base.SetUp();
+        }
+
+        private void RecreateMessageQueue(string path, bool transactional)
+        {
+            bool defaultCacheEnabled = MessageQueue.EnableConnectionCache;
+            MessageQueue.ClearConnectionCache();
+            MessageQueue.EnableConnectionCache = false;
+            if (MessageQueue.Exists(path))
+            {
+                MessageQueue queue;
+// TODO (EE): delete/create doesn't work for some reason
+//                MessageQueue.Delete(path);
+//                queue = MessageQueue.Create(path, transactional);
+                queue = new MessageQueue(path);
+                queue.Purge();
+                queue.Dispose();
+            }
+            else
+            {
+                MessageQueue.Create(path, transactional).Dispose();
+            }
+            MessageQueue.ClearConnectionCache();
+            MessageQueue.EnableConnectionCache = defaultCacheEnabled; // set to default
+        }
+
 #if NET_2_0 || NET_3_0
         [Test]
         public void MessageCreator()
@@ -91,7 +121,7 @@ namespace Spring.Messaging.Core
             mqt.AfterPropertiesSet();
         }
 
-        [Test]
+        [Test, Ignore("obsolete test, defaultMessageQueueName is used to obtain a queue from MessageQueueFactory")]
         [ExpectedException(typeof (ArgumentException),
             ExpectedMessage = "No object named noqueuename is defined in the Spring container")]
         public void MessageQueueNameNotInContext()
@@ -109,7 +139,7 @@ namespace Spring.Messaging.Core
             Assert.AreEqual(q.DefaultMessageQueue, q.MessageQueueFactory.CreateMessageQueue(q.DefaultMessageQueueObjectName));        
         }
 
-        [Test]
+        [Test, Ignore("obsolete test. If necessary, registers a default message converter on first use")]
         [ExpectedException(typeof (InvalidOperationException),
             ExpectedMessage = "No MessageConverter registered. Check configuration of MessageQueueTemplate.")]
         public void MessageConverterNotRegistered()
@@ -126,6 +156,7 @@ namespace Spring.Messaging.Core
         {
             MessageQueueTemplate q = applicationContext["queue"] as MessageQueueTemplate;
             Assert.IsNotNull(q);
+            q.ConvertAndSend("Hello World 1");
             ReceiveHelloWorld(null,q,1);
         }
 
@@ -224,7 +255,7 @@ namespace Spring.Messaging.Core
 
         #endregion
 
-        [Test]
+        [Test, Ignore("What's the purpose of this test?")]
         public void GetAllFromQueue()
         {
             MessageQueueTemplate q = applicationContext["queue"] as MessageQueueTemplate;
diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/DistributedTxMessageListenerContainerTests.xml b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/DistributedTxMessageListenerContainerTests.xml
index 21a9b6c5..587ceb34 100644
--- a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/DistributedTxMessageListenerContainerTests.xml
+++ b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/DistributedTxMessageListenerContainerTests.xml
@@ -42,12 +42,12 @@
   </object>
 
   <object id="queueTemplate" type="Spring.Messaging.Core.MessageQueueTemplate, Spring.Messaging">
-    <property name="MessageQueueObjectName" value="msmqtxqueue"/>
+    <property name="DefaultMessageQueueObjectName" value="msmqtxqueue"/>
     <property name="MessageConverterObjectName" value="messageConverter"/>
   </object>
 
   <object id="retryQueueTemplate" type="Spring.Messaging.Core.MessageQueueTemplate, Spring.Messaging">
-    <property name="MessageQueueObjectName" value="msmqtxretryqueue"/>
+    <property name="DefaultMessageQueueObjectName" value="msmqtxretryqueue"/>
     <property name="MessageConverterObjectName" value="messageConverter"/>
   </object>
   
@@ -57,7 +57,7 @@
   </object>
 
   <object id="transactionalMessageListenerContainer" type="Spring.Messaging.Listener.DistributedTxMessageListenerContainer, Spring.Messaging">
-    <property name="MessageQueueObjectName" value="msmqtxqueue"/>
+    <property name="DefaultMessageQueueObjectName" value="msmqtxqueue"/>
     <property name="PlatformTransactionManager" ref="txScopeTransactionManager"/>
     <property name="MaxConcurrentListeners" value="1"/>
     <property name="ListenerTimeLimitInMillis" value="20000"/>
@@ -77,8 +77,8 @@
   </object>
 
   <object id="distributedTransactionExceptionHandler" type="Spring.Messaging.Listener.SendToQueueDistributedTransactionExceptionHandler, Spring.Messaging">
+    <property name="DefaultMessageQueueObjectName" value="msmqtxretryqueue"/>
     <property name="MaxRetry" value="2"/>
-    <property name="MessageQueueObjectName" value="msmqtxretryqueue"/>
   </object>
   
   <object id="simpleMessageListener" type="Spring.Messaging.Listener.SimpleMessageListener, Spring.Messaging.Tests"/>
diff --git a/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.dll.config b/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.dll.config
index dce5b27c..dcf0fb70 100644
--- a/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.dll.config
+++ b/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.dll.config
@@ -25,17 +25,25 @@ limitations under the License.
       <section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core" />
     </sectionGroup>
 
+<!--
     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
+-->
   </configSections>
 
   <common>
     <logging>
+<!--
       <factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net">
         <arg key="configType" value="INLINE" />
       </factoryAdapter>
+-->
+      <factoryAdapter type="Common.Logging.Simple.TraceLoggerFactoryAdapter, Common.Logging">
+        <arg key="level" value="ALL" />
+      </factoryAdapter>
     </logging>
   </common>
 
+<!--
   <log4net>
 
     <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
@@ -58,6 +66,7 @@ limitations under the License.
     </logger>
 
   </log4net>
+-->
   
   <spring>
     <parsers>