Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs
===================================================================
diff -u -r2702 -r2786
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs	(.../SensorLocation.cs)	(revision 2702)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs	(.../SensorLocation.cs)	(revision 2786)
@@ -376,7 +376,7 @@
             if (memberName == MemberNames.PolderLevel)
             {
                 if (SourceTypePl1WaterLevelAtPolder == DataSourceTypeSensors.LocationData)
-                    return Location.PolderLevel;
+                    return Location.Scenarios[0].PolderLevel;
 
                 if (SourceTypePl1WaterLevelAtPolder == DataSourceTypeSensors.Sensor)
                     return sensorValues[sensor];
Index: DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs
===================================================================
diff -u -r2785 -r2786
--- DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs	(.../SensorLocationTests.cs)	(revision 2785)
+++ DamClients/DamUI/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs	(.../SensorLocationTests.cs)	(revision 2786)
@@ -19,23 +19,22 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Deltares.Dam.Data;
 using Deltares.Dam.Data.Sensors;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.GeotechnicalGeometry;
 using Deltares.Geotechnics.SurfaceLines;
-using Deltares.Standard.TestUtils;
 using NUnit.Framework;
 
 namespace Deltares.Dam.Tests.Sensors
 {
     [TestFixture]
     public class SensorLocationTest
     {
-        readonly Location location = new Location();
-        readonly Scenario scenario = new Scenario();
+        private Location location;
+
         #region Setup
 
         [TestFixtureSetUp]
@@ -51,7 +50,9 @@
         [SetUp]
         public void TestSetup()
         {
-            location.Scenarios.Add(scenario);
+            location = new Location();
+
+            location.Scenarios.Add(new Scenario());
         }
 
         [TearDown]
@@ -731,19 +732,21 @@
         public void GetValue_WaterLevelAtPolderAndDataSourceTypeLocationData_ShouldReturnValue()
         {
             // setup
+            var random = new Random(21);
+            double polderLevel = random.NextDouble();
+            location.Scenarios[0].PolderLevel = polderLevel;
+
             var sensor = new Sensor();
-            const double testValue = 1.1;
-            var sensorValues = new Dictionary<Sensor, double> { { sensor, testValue } };
+            var sensorValues = new Dictionary<Sensor, double> { { sensor, random.NextDouble() } };
             var sensorLocation = CreateValidSensorLocation();
-            location.PolderLevel = testValue;
 
             sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
 
             // call
             var actualValue = sensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtPolder, sensorValues, sensor);
 
             // assert            
-            Assert.AreEqual(testValue, actualValue);
+            Assert.AreEqual(polderLevel, actualValue);
         }
 
         [Test]
@@ -931,43 +934,7 @@
             // assert            
             Assert.AreEqual(expectedValue, actualValue);
         }
-
-        [Test]
-        public void GetValue_PolderLevelAndSourceTypeIgnore_ReturnsNull()
-        {
-            // Setup
-            var sensor = new Sensor();
-            const double sensorValue = 1.1;
-            var sensorValues = new Dictionary<Sensor, double> { { sensor, sensorValue } };
-            var sensorLocation = CreateValidSensorLocation();
-
-            sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.Ignore;
-
-            // call
-            var actualValue = sensorLocation.GetValue(x => x.PolderLevel, sensorValues, sensor);
-
-            // assert            
-            Assert.IsNull(actualValue);
-        }
-
-        [Test]
-        public void GetValue_PolderLevelAndSourceTypeSensor_ReturnsSensorValue()
-        {
-            // Setup
-            var sensor = new Sensor();
-            const double sensorValue = 1.1;
-            var sensorValues = new Dictionary<Sensor, double> { { sensor, sensorValue } };
-            var sensorLocation = CreateValidSensorLocation();
-
-            sensorLocation.SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.Sensor;
-
-            // call
-            var actualValue = sensorLocation.GetValue(x => x.PolderLevel, sensorValues, sensor);
-
-            // assert            
-            Assert.AreEqual(sensorValue, actualValue);
-        }
-
+        
         #endregion