diff --git a/src/CalculatorUITestFramework/MockedCurrencyServer.cs b/src/CalculatorUITestFramework/MockedCurrencyServer.cs
index c3ad4efc..adecb92e 100644
--- a/src/CalculatorUITestFramework/MockedCurrencyServer.cs
+++ b/src/CalculatorUITestFramework/MockedCurrencyServer.cs
@@ -15,6 +15,8 @@ namespace CalculatorUITestFramework
             {
                 Prefixes =
                 {
+                    // to trust below URL on your dev machine, run below command in cmd as admin
+                    // netsh http add urlacl url="http://localhost:80/calctesting/file" user=everyone
                     "http://localhost/calctesting/file/",
                 }
             };
diff --git a/src/CalculatorUITests/CurrencyConverterFunctionalTests.cs b/src/CalculatorUITests/CurrencyConverterFunctionalTests.cs
index c80d723b..5e4ecbac 100644
--- a/src/CalculatorUITests/CurrencyConverterFunctionalTests.cs
+++ b/src/CalculatorUITests/CurrencyConverterFunctionalTests.cs
@@ -10,6 +10,7 @@ namespace CalculatorUITests
     public class CurrencyConverterFunctionalTests
     {
         private static readonly UnitConverterPage page = new UnitConverterPage();
+        private static MockedCurrencyServer _currencyServer;
 
         public TestContext TestContext { get; set; }
 
@@ -22,7 +23,7 @@ namespace CalculatorUITests
         {
             // Create session to launch a Calculator window
             CalculatorDriver.Instance.SetupCalculatorSession(context);
-            context.Properties.Add("MockedDataServer", new MockedCurrencyServer());
+            _currencyServer = new MockedCurrencyServer();
         }
 
         /// <summary>
@@ -33,6 +34,7 @@ namespace CalculatorUITests
         {
             // Tear down Calculator session.
             CalculatorDriver.Instance.TearDownCalculatorSession();
+            _currencyServer.Dispose();
         }
 
         /// <summary>