Index: Core/Common/test/Core.Common.Gui.Test/PropertyBag/ObjectPropertiesTest.cs
===================================================================
diff -u -re217c241d1d57575c99e1062b449ea595f9fc764 -r47753792698f20fe390e1c8080e59e9c59aaa9fa
--- Core/Common/test/Core.Common.Gui.Test/PropertyBag/ObjectPropertiesTest.cs	(.../ObjectPropertiesTest.cs)	(revision e217c241d1d57575c99e1062b449ea595f9fc764)
+++ Core/Common/test/Core.Common.Gui.Test/PropertyBag/ObjectPropertiesTest.cs	(.../ObjectPropertiesTest.cs)	(revision 47753792698f20fe390e1c8080e59e9c59aaa9fa)
@@ -35,53 +35,56 @@
         public void DefaultConstructor_ExpectedValues()
         {
             // Call
-            var properties = new ObjectProperties<string>();
-
-            // Assert
-            Assert.IsInstanceOf<IObjectProperties>(properties);
-            Assert.IsInstanceOf<IDisposable>(properties);
-            Assert.IsNull(properties.Data);
+            using (var properties = new ObjectProperties<string>())
+            {
+                // Assert
+                Assert.IsInstanceOf<IObjectProperties>(properties);
+                Assert.IsInstanceOf<IDisposable>(properties);
+                Assert.IsNull(properties.Data);
+            }
         }
 
         [Test]
         public void Data_SetValue_GetNewlySetValue()
         {
             // Setup
-            var properties = new ObjectProperties<string>();
+            using (var properties = new ObjectProperties<string>())
+            {
+                const string text = "text";
 
-            const string text = "text";
+                // Call
+                properties.Data = text;
 
-            // Call
-            properties.Data = text;
-
-            // Assert
-            Assert.AreEqual(text, properties.Data);
+                // Assert
+                Assert.AreEqual(text, properties.Data);
+            }
         }
 
         [Test]
         public void Data_IsNotBrowsable()
         {
             // Setup
-            var properties = new ObjectProperties<string>();
+            using (var properties = new ObjectProperties<string>())
+            {
+                const string dataPropertyName = nameof(ObjectProperties<string>.Data);
+                PropertyInfo propertyInfo = properties.GetType().GetProperty(dataPropertyName);
 
-            const string dataPropertyName = nameof(ObjectProperties<string>.Data);
-            PropertyInfo propertyInfo = properties.GetType().GetProperty(dataPropertyName);
+                // Call
+                var browsableAttribute = (BrowsableAttribute) Attribute.GetCustomAttribute(propertyInfo,
+                                                                                           typeof(BrowsableAttribute),
+                                                                                           true);
 
-            // Call
-            var browsableAttribute = (BrowsableAttribute) Attribute.GetCustomAttribute(propertyInfo,
-                                                                                       typeof(BrowsableAttribute),
-                                                                                       true);
-
-            // Assert
-            Assert.AreEqual(BrowsableAttribute.No, browsableAttribute);
+                // Assert
+                Assert.AreEqual(BrowsableAttribute.No, browsableAttribute);
+            }
         }
 
         [Test]
         public void GivenObjectPropertiesWithObservableDataSet_WhenNotifyingObserver_RefreshRequiredEventRaised()
         {
             // Given
             var observable = new SimpleObservable();
-            using (var properties = new ObjectProperties<SimpleObservable>()
+            using (var properties = new ObjectProperties<SimpleObservable>
             {
                 Data = observable
             })
@@ -104,7 +107,7 @@
             var refreshRequiredRaised = 0;
 
             var observable = new SimpleObservable();
-            using (var properties = new ObjectProperties<SimpleObservable>()
+            using (var properties = new ObjectProperties<SimpleObservable>
             {
                 Data = observable
             })
@@ -119,6 +122,6 @@
             Assert.AreEqual(0, refreshRequiredRaised);
         }
 
-        private class SimpleObservable : Observable {} 
+        private class SimpleObservable : Observable {}
     }
 }
\ No newline at end of file