     helpers.beginTest(browser)
 
     environmentHelpers.openVmSettingsModal(browser, 'koding-vm-1')
-    environmentHelpers.clickMoreButtonInVMSettingsModal(browser)
 
-    browser.element  'css selector', '.more-form .alwayson .koding-on-off.on', (result) =>
+    browser.element  'css selector', '.AppModal-form.with-fields .alwayson .koding-on-off.on', (result) =>
       if result.status is 0
         console.log 'VM is already always on, ending test...'
         browser.end()
 
       else
         browser
-          .waitForElementVisible    '.more-form .alwayson', 20000
-          .click                    '.more-form .alwayson .koding-on-off'
+          .waitForElementVisible    '.AppModal-form.with-fields .alwayson', 20000
+          .click                    '.AppModal-form.with-fields .alwayson .koding-on-off'
           .pause                    1000
           .refresh()
           .waitForElementVisible    '[testpath=main-sidebar]', 25000, =>
 
             environmentHelpers.openVmSettingsModal(browser, 'koding-vm-1')
-            environmentHelpers.clickMoreButtonInVMSettingsModal(browser) # Assertion
 
             browser
-              .waitForElementVisible   '.more-form .alwayson .koding-on-off.on', 20000
+              .waitForElementVisible   '.AppModal-form.with-fields .alwayson .koding-on-off.on', 20000
               .end()

  addVM: (browser) ->

    freeModalSelector = '.computeplan-modal.free-plan'
    vmSelector        = '.sidebar-machine-box.koding-vm-1'

    helpers.beginTest(browser)
    helpers.waitForVMRunning(browser)

  makeAlwaysOnForNotPaidUser: (browser) ->

    toggleSelector = '.machine-settings-modal .alwayson'

    helpers.beginTest(browser)

