diff --git a/test/check-application b/test/check-application
index 629694a..64099a8 100755
--- a/test/check-application
+++ b/test/check-application
@@ -30,7 +30,7 @@ class TestApplication(testlib.MachineCase):
 
     def testFastforwardControls(self):
         fast_forward_btn = "button.btn:nth-child(6)"
-        restart_btn = "button.btn:nth-child(5)"
+        restart_btn = "#recording-wrap > div > div > div.panel-footer > button:nth-child(5)"
         slider = "div.slider-handle:nth-child(5)"
         term_line = "#recording-wrap > div > div > div.panel-body > div > div > div > div:nth-child(26)"
         b = self.browser
@@ -94,32 +94,35 @@ class TestApplication(testlib.MachineCase):
         b.wait_text(speed_val, "")
 
     def testZoomControls(self):
-        skip_frame_btn = "#recording-wrap > div > div > div.panel-footer > button:nth-child(4)"
-        zoom_in_btn = "button.btn-lg:nth-child(2)"
-        zoom_out_btn = "#recording-wrap > div > div > div.panel-footer > span:nth-child(11) > button:nth-child(4)"
-        zoom_restore_btn = "#recording-wrap > div > div > div.panel-footer > span:nth-child(11) > button:nth-child(3)"
-        term = "#recording-wrap > div > div > div.panel-body > div > div"
+        zoom_in_btn = "#recording-wrap > div > div > div.panel-footer > span:nth-child(11) > button:nth-child(3)"
+        zoom_out_btn = "#recording-wrap > div > div > div.panel-footer > span:nth-child(11) > button:nth-child(5)"
+        zoom_reset_btn = "#recording-wrap > div > div > div.panel-footer > span:nth-child(11) > button:nth-child(4)"
+        default_scale_sel = '.console-ct[style^="transform: scale(1)"]'
+        zoom_one_scale_sel = '.console-ct[style^="transform: scale(1.1)"]'
+        zoom_two_scale_sel = '.console-ct[style^="transform: scale(1.2)"]'
+        zoom_three_scale_sel = '.console-ct[style^="transform: scale(1.3)"]'
+        zoom_reset_scale_sel = '.console-ct[style^="transform: scale(0.823864)"]'
         b = self.browser
         m = self.machine
         self.login_and_go("/session-recording")
         b.wait_present(".content-header-extra")
         b.wait_present("#user")
         b.click(".listing-ct-item")
-        b.wait_attr(term, "style", "transform: scale(1) translate(-50%, -50%); transform-origin: left top 0px; display: inline-block; margin: 0px auto; position: absolute; top: 50%; left: 50%;")
-        b.wait_present(skip_frame_btn)
-        b.click(skip_frame_btn)
-        # zoom in
-        b.wait_attr(term, "style", "transform: scale(0.763158) translate(-50%, -50%); transform-origin: left top 0px; display: inline-block; margin: 0px auto; position: absolute; top: 50%; left: 50%;")
+        # Wait for terminal with scale(1)
+        b.wait_present(default_scale_sel)
+        # Zoom in x3
         b.click(zoom_in_btn)
-        b.wait_attr(term, "style", "transform: scale(0.863158) translate(0px, 0px); transform-origin: left top 0px; display: inline-block; margin: 0px auto; position: absolute; top: 0px; left: 0px;")
+        b.wait_present(zoom_one_scale_sel)
         b.click(zoom_in_btn)
-        b.wait_attr(term, "style", "transform: scale(0.963158) translate(0px, 0px); transform-origin: left top 0px; display: inline-block; margin: 0px auto; position: absolute; top: 0px; left: 0px;")
+        b.wait_present(zoom_two_scale_sel)
         b.click(zoom_in_btn)
-        b.wait_attr(term, "style", "transform: scale(1.06316) translate(0px, 0px); transform-origin: left top 0px; display: inline-block; margin: 0px auto; position: absolute; top: 0px; left: 0px;")
-        b.click(zoom_restore_btn)
-        b.wait_attr(term, "style", "transform: scale(0.763158) translate(-50%, -50%); transform-origin: left top 0px; display: inline-block; margin: 0px auto; position: absolute; top: 50%; left: 50%;")
+        b.wait_present(zoom_three_scale_sel)
+        # Zoom Out
         b.click(zoom_out_btn)
-        b.wait_attr(term, "style", "transform: scale(0.663158) translate(0px, 0px); transform-origin: left top 0px; display: inline-block; margin: 0px auto; position: absolute; top: 0px; left: 0px;")
+        b.wait_present(zoom_two_scale_sel)
+        # Reset Zoom
+        b.click(zoom_reset_btn)
+        b.wait_present(zoom_reset_scale_sel)
 
     def testSkipFrame(self):
         skip_frame_btn = "#recording-wrap > div > div > div.panel-footer > button:nth-child(4)"
@@ -136,7 +139,7 @@ class TestApplication(testlib.MachineCase):
         b.click(skip_frame_btn)
         b.click(skip_frame_btn)
         b.click(skip_frame_btn)
-        b.wait_timeout(5000)
+        b.wait_timeout(20)
         b.wait_in_text(term_first_line, "localhost")
 
 if __name__ == '__main__':