diff --git a/t/selenium/functions/Collections.py b/t/selenium/functions/Collections.py
index 04100992..3beca015 100644
--- a/t/selenium/functions/Collections.py
+++ b/t/selenium/functions/Collections.py
@@ -48,6 +48,8 @@ def logout_panel(driver):
 def create_customer(driver, name=None):
     if not name:
         name = 'customer' + str(random.randint(1, 100000)) + 'test'
+    WebDriverWait(driver, 10).until(EC.element_to_be_clickable((
+        By.XPATH, '//*[@id="main-nav"]//*[contains(text(),"Settings")]')))
     driver.find_element_by_xpath(
         '//*[@id="main-nav"]//*[contains(text(),"Settings")]').click()
     driver.find_element_by_link_text('Customers').click()
@@ -71,6 +73,8 @@ def create_customer(driver, name=None):
 
 
 def delete_customer(driver, name):
+    WebDriverWait(driver, 10).until(EC.element_to_be_clickable((
+        By.XPATH, '//*[@id="main-nav"]//*[contains(text(),"Settings")]')))
     driver.find_element_by_xpath(
         '//*[@id="main-nav"]//*[contains(text(),"Settings")]').click()
     driver.find_element_by_link_text('Customers').click()
@@ -84,13 +88,15 @@ def delete_customer(driver, name):
     WebDriverWait(driver, 10).until(EC.element_to_be_clickable((
         By.XPATH, '//*[@id="Customer_table"]//tr[1]//td'
         '[text()="%s"]' % name)))
-    Functions.move_and_click(
+    Functions.click_js(
         driver, '//*[@id="Customer_table"]//tr[1]//td//a[contains(text(),'
         ' "Terminate")]')
     driver.find_element_by_xpath('//*[@id="dataConfirmOK"]').click()
 
 
 def create_subscriber(driver, customername, domainname):
+    WebDriverWait(driver, 10).until(EC.element_to_be_clickable((
+        By.XPATH, '//*[@id="main-nav"]//*[contains(text(),"Settings")]')))
     driver.find_element_by_xpath(
         '//*[@id="main-nav"]//*[contains(text(),"Settings")]').click()
     driver.find_element_by_link_text('Customers').click()
@@ -104,7 +110,7 @@ def create_subscriber(driver, customername, domainname):
     WebDriverWait(driver, 10).until(EC.element_to_be_clickable((
         By.XPATH, '//*[@id="Customer_table"]//tr[1]//td'
         '[text()="%s"]' % customername)))
-    Functions.move_and_click(
+    Functions.click_js(
         driver, '//*[@id="Customer_table"]//tr[1]//td//a[contains(text(),'
         ' "Details")]')
     driver.find_element_by_link_text('Expand Groups').click()
@@ -136,6 +142,8 @@ def create_subscriber(driver, customername, domainname):
 
 
 def delete_subscriber(driver, customername):
+    WebDriverWait(driver, 10).until(EC.element_to_be_clickable((
+        By.XPATH, '//*[@id="main-nav"]//*[contains(text(),"Settings")]')))
     driver.find_element_by_xpath(
         '//*[@id="main-nav"]//*[contains(text(),"Settings")]').click()
     driver.find_element_by_link_text('Customers').click()
@@ -149,12 +157,12 @@ def delete_subscriber(driver, customername):
     WebDriverWait(driver, 10).until(EC.element_to_be_clickable((
         By.XPATH, '//*[@id="Customer_table"]//tr[1]//td'
         '[text()="%s"]' % customername)))
-    Functions.move_and_click(
+    Functions.click_js(
         driver, '//*[@id="Customer_table"]//tr[1]//td//a[contains(text(),'
         ' "Details")]')
     driver.find_element_by_link_text('Expand Groups').click()
     Functions.scroll_to_element(driver, 'Subscribers')
-    Functions.move_and_click(
+    Functions.click_js(
         driver, '//*[@id="subscribers_table"]//tr[1]//td//a[contains(text(), '
         '"Terminate")]')
     driver.find_element_by_xpath('//*[@id="dataConfirmOK"]').click()
@@ -163,6 +171,8 @@ def delete_subscriber(driver, customername):
 def create_domain(driver, name=None):
     if not name:
         name = 'domain' + str(random.randint(1, 100000)) + 'test'
+    WebDriverWait(driver, 10).until(EC.element_to_be_clickable((
+        By.XPATH, '//*[@id="main-nav"]//*[contains(text(),"Settings")]')))
     driver.find_element_by_xpath(
         '//*[@id="main-nav"]//*[contains(text(),"Settings")]').click()
     driver.find_element_by_link_text('Domains').click()
@@ -177,6 +187,8 @@ def create_domain(driver, name=None):
 
 
 def delete_domain(driver, name):
+    WebDriverWait(driver, 10).until(EC.element_to_be_clickable((
+        By.XPATH, '//*[@id="main-nav"]//*[contains(text(),"Settings")]')))
     driver.find_element_by_xpath(
         '//*[@id="main-nav"]//*[contains(text(),"Settings")]').click()
     driver.find_element_by_link_text('Domains').click()
@@ -189,7 +201,7 @@ def delete_domain(driver, name):
         driver, '//*[@id="Domain_table_filter"]//input', name)
     WebDriverWait(driver, 10).until(EC.element_to_be_clickable((
         By.XPATH, '//*[@id="Domain_table"]//tr[1]//td[text()="%s"]' % name)))
-    Functions.move_and_click(
+    Functions.click_js(
         driver, '//*[@id="Domain_table"]//tr[1]//td//a[contains(text(),'
         ' "Delete")]')
     driver.find_element_by_xpath('//*[@id="dataConfirmOK"]').click()
diff --git a/t/selenium/functions/Functions.py b/t/selenium/functions/Functions.py
index 148a9c8c..5d1b297c 100644
--- a/t/selenium/functions/Functions.py
+++ b/t/selenium/functions/Functions.py
@@ -23,16 +23,6 @@ def scroll_to_element(driver, element):
     driver.execute_script("arguments[0].scrollIntoView();", webelem)
 
 
-def move_and_click(driver, element):
-    webelement = driver.find_element_by_xpath(element)
-    hoverclick = ActionChains(driver)
-    hoverclick.move_to_element_with_offset(
-        driver.find_element_by_xpath('/html/body'), 100, 100)
-    hoverclick.move_to_element(webelement)
-    hoverclick.click()
-    hoverclick.perform()
-
-
 def click_js(driver, element):
     if element[:1] == "/":
         webelement = driver.find_element_by_xpath(element)