diff --git a/src/CalculatorUITestFramework/StandardAoTCalculatorPage.cs b/src/CalculatorUITestFramework/StandardAoTCalculatorPage.cs
index 066d32d8..9eedc312 100644
--- a/src/CalculatorUITestFramework/StandardAoTCalculatorPage.cs
+++ b/src/CalculatorUITestFramework/StandardAoTCalculatorPage.cs
@@ -95,40 +95,29 @@ namespace CalculatorUITestFramework
             return ToolTip.Text;
         }
 
-        ///// <summary>
-        ///// Checks in AoT (Keep on top) button is present
-        ///// </summary>
-        public string GetAoTPresence()
+        /// <summary>
+        /// Checks in AoT (Keep on top) button is present
+        /// </summary>
+        public bool IsKeepOnTopButtonPresent()
         {
-            bool AoTPresent;
             string source = this.session.PageSource;
-            if (source.Contains("Keep on top"))
-            {
-                AoTPresent = true;
-            }
-            else
-            {
-                AoTPresent = false;
-            }
-            return AoTPresent.ToString();
+            return source.Contains("Keep on top");
         }
 
-        ///// <summary>
-        ///// Checks Standard calculator to see if it's in AoT (Keep on top)
-        ///// </summary>
-        public string AoTModeCheck()
+        /// <summary>
+        /// Checks Standard calculator to see if it's in AoT (Keep on top)
+        /// </summary>
+        public bool IsInAlwaysOnTopMode()
         {
-            bool InAoTMode;
             string source = this.session.PageSource;
             if ((source.Contains("Keep on top")) && (source.Contains("Header")))
             {
-                InAoTMode = false;
+                return false;
             }
             else
             {
-                InAoTMode = true;
+                return true;
             }
-            return InAoTMode.ToString();
         }
 
         /// <summary>
diff --git a/src/CalculatorUITests/StandardModeFunctionalTests.cs b/src/CalculatorUITests/StandardModeFunctionalTests.cs
index 1795de2c..80b8e7aa 100644
--- a/src/CalculatorUITests/StandardModeFunctionalTests.cs
+++ b/src/CalculatorUITests/StandardModeFunctionalTests.cs
@@ -724,26 +724,22 @@ namespace CalculatorUITests
         {
             page.NavigationMenu.ChangeCalculatorMode(CalculatorMode.ScientificCalculator);
             Assert.AreEqual("Scientific", CalculatorApp.GetCalculatorHeaderText());
-            page.StandardAoTCalculatorPage.GetAoTPresence();
-            Assert.AreEqual("False", page.StandardAoTCalculatorPage.GetAoTPresence());
+            Assert.IsFalse(page.StandardAoTCalculatorPage.IsKeepOnTopButtonPresent());
 
             CalculatorApp.EnsureCalculatorHasFocus();
             page.NavigationMenu.ChangeCalculatorMode(CalculatorMode.ProgrammerCalculator);
             Assert.AreEqual("Programmer", CalculatorApp.GetCalculatorHeaderText());
-            page.StandardAoTCalculatorPage.GetAoTPresence();
-            Assert.AreEqual("False", page.StandardAoTCalculatorPage.GetAoTPresence());
+            Assert.IsFalse(page.StandardAoTCalculatorPage.IsKeepOnTopButtonPresent());
 
             CalculatorApp.EnsureCalculatorHasFocus();
             page.NavigationMenu.ChangeCalculatorMode(CalculatorMode.DateCalculator);
             Assert.AreEqual("Date calculation", CalculatorApp.GetCalculatorHeaderText());
-            page.StandardAoTCalculatorPage.GetAoTPresence();
-            Assert.AreEqual("False", page.StandardAoTCalculatorPage.GetAoTPresence());
+            Assert.IsFalse(page.StandardAoTCalculatorPage.IsKeepOnTopButtonPresent());
 
             CalculatorApp.EnsureCalculatorHasFocus();
             page.NavigationMenu.ChangeCalculatorMode(CalculatorMode.StandardCalculator);
             Assert.AreEqual("Standard", CalculatorApp.GetCalculatorHeaderText());
-            page.StandardAoTCalculatorPage.GetAoTPresence();
-            Assert.AreEqual("True", page.StandardAoTCalculatorPage.GetAoTPresence());
+            Assert.IsTrue(page.StandardAoTCalculatorPage.IsKeepOnTopButtonPresent());
         }
 
         [TestMethod]
@@ -755,8 +751,7 @@ namespace CalculatorUITests
             page.StandardOperators.DivideButton.Click();
             page.StandardOperators.NumberPad.Num0Button.Click();
             page.StandardOperators.EqualButton.Click();
-            page.StandardAoTCalculatorPage.AoTModeCheck();
-            Assert.AreEqual("True", page.StandardAoTCalculatorPage.AoTModeCheck());
+            Assert.IsTrue(page.StandardAoTCalculatorPage.IsInAlwaysOnTopMode());
             Assert.AreEqual("Result is undefined", page.CalculatorResults.GetAoTCalculatorResultText());
         }
 
@@ -768,8 +763,7 @@ namespace CalculatorUITests
             page.StandardAoTCalculatorPage.ResizeAoTWindowToDisplayInvertButton();
             page.StandardOperators.ClearButton.Click();
             page.StandardOperators.InvertButton.Click();
-            page.StandardAoTCalculatorPage.AoTModeCheck();
-            Assert.AreEqual("True", page.StandardAoTCalculatorPage.AoTModeCheck());
+            Assert.IsTrue(page.StandardAoTCalculatorPage.IsInAlwaysOnTopMode());
             Assert.AreEqual("Cannot divide by zero", page.CalculatorResults.GetAoTCalculatorResultText());
         }
 
@@ -781,12 +775,10 @@ namespace CalculatorUITests
             page.StandardAoTCalculatorPage.ResizeAoTWindowToDisplayInvertButton();
             page.StandardOperators.ClearButton.Click();
             page.StandardOperators.InvertButton.Click();
-            page.StandardAoTCalculatorPage.AoTModeCheck();
-            Assert.AreEqual("True", page.StandardAoTCalculatorPage.AoTModeCheck());
+            Assert.IsTrue(page.StandardAoTCalculatorPage.IsInAlwaysOnTopMode());
             Assert.AreEqual("Cannot divide by zero", page.CalculatorResults.GetAoTCalculatorResultText());
             page.StandardAoTCalculatorPage.NavigateToStandardMode();
-            page.StandardAoTCalculatorPage.AoTModeCheck();
-            Assert.AreEqual("False", page.StandardAoTCalculatorPage.AoTModeCheck());
+            Assert.IsFalse(page.StandardAoTCalculatorPage.IsInAlwaysOnTopMode());
             Assert.AreEqual("Cannot divide by zero", page.CalculatorResults.GetCalculatorResultText());
         }