Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/PresentationObjects/LocationCalculationsContextTest.cs
===================================================================
diff -u -r76df5cd9a64862ec2239dfcf6e539cd72f96b7e8 -r7f91b938135e4f0e5782ce023ec8ae94cd07c221
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/PresentationObjects/LocationCalculationsContextTest.cs	(.../LocationCalculationsContextTest.cs)	(revision 76df5cd9a64862ec2239dfcf6e539cd72f96b7e8)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/PresentationObjects/LocationCalculationsContextTest.cs	(.../LocationCalculationsContextTest.cs)	(revision 7f91b938135e4f0e5782ce023ec8ae94cd07c221)
@@ -35,7 +35,7 @@
         public void Constructor_ExpectedValues()
         {
             // Call
-            var context = new TestLocationCalculationsContext(new object(), new ObservableList<IObservable>());
+            var context = new TestLocationCalculationsContext(new object(), new ObservableList<TestObservable>());
 
             // Assert
             Assert.IsInstanceOf<WrappedObjectContextBase<object>>(context);
@@ -51,7 +51,7 @@
             var observer = mockRepository.StrictMock<IObserver>();
             mockRepository.ReplayAll();
 
-            var context = new TestLocationCalculationsContext(new object(), new ObservableList<IObservable>());
+            var context = new TestLocationCalculationsContext(new object(), new ObservableList<TestObservable>());
 
             // When
             context.Attach(observer);
@@ -70,7 +70,7 @@
             var observer = mockRepository.StrictMock<IObserver>();
             mockRepository.ReplayAll();
 
-            var context = new TestLocationCalculationsContext(new object(), new ObservableList<IObservable>());
+            var context = new TestLocationCalculationsContext(new object(), new ObservableList<TestObservable>());
 
             context.Attach(observer);
 
@@ -88,10 +88,10 @@
             // Given
             var mockRepository = new MockRepository();
             var observer = mockRepository.StrictMock<IObserver>();
-            observer.Expect(o => o.UpdateObserver()).Repeat.Any();
+            observer.Expect(o => o.UpdateObserver());
             mockRepository.ReplayAll();
 
-            var locationCalculationsListToObserve = new ObservableList<IObservable>();
+            var locationCalculationsListToObserve = new ObservableList<TestObservable>();
             var context = new TestLocationCalculationsContext(new object(), locationCalculationsListToObserve);
 
             context.Attach(observer);
@@ -113,7 +113,7 @@
             mockRepository.ReplayAll();
 
             var observable = new TestObservable();
-            var locationCalculationsListToObserve = new ObservableList<IObservable>
+            var locationCalculationsListToObserve = new ObservableList<TestObservable>
             {
                 observable
             };
@@ -129,14 +129,14 @@
             mockRepository.VerifyAll();
         }
 
-        private class TestLocationCalculationsContext : LocationCalculationsContext<object, IObservable>
+        private class TestLocationCalculationsContext : LocationCalculationsContext<object, TestObservable>
         {
-            public TestLocationCalculationsContext(object wrappedData, ObservableList<IObservable> locationCalculationsListToObserve) : base(wrappedData)
+            public TestLocationCalculationsContext(object wrappedData, ObservableList<TestObservable> locationCalculationsListToObserve) : base(wrappedData)
             {
                 LocationCalculationsListToObserve = locationCalculationsListToObserve;
             }
 
-            protected override ObservableList<IObservable> LocationCalculationsListToObserve { get; }
+            protected override ObservableList<TestObservable> LocationCalculationsListToObserve { get; }
         }
 
         private class TestObservable : Observable {}