diff --git a/functional_tests/test_export_modal.py b/functional_tests/test_export_modal.py
index 6981507dcb64d5f8cdf09d36fbcc445a3be362d9..bd4ad1bbfc233a7e86851a6f775cf0a9a7b4954e 100644
--- a/functional_tests/test_export_modal.py
+++ b/functional_tests/test_export_modal.py
@@ -2,6 +2,8 @@ import json
 import os
 from pathlib import Path
 from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.common.action_chains import ActionChains
+
 
 from core.models import UserAccount
 from functional_tests.util import GradyTestCase, login, reset_browser_after_test
@@ -124,7 +126,9 @@ class ExportTestModal(GradyTestCase):
         self.browser.find_element_by_id('export-btn').click()
         self.browser.find_element_by_id('export-list1').click()
         instance_export_modal = self.browser.find_element_by_id('instance-export-modal')
-        instance_export_modal.find_element_by_id('instance-export-dl').click()
+        # instance_export_modal.find_element_by_id('instance-export-dl').click()
+        export_btn = self.browser.find_element_by_id('instance-export-dl')
+        ActionChains(self.browser).move_to_element(export_btn).click().perform()
         WebDriverWait(self.browser, 10).until(expect_file_to_be_downloaded(JSON_EXPORT_FILE))
         try:
             with open(JSON_EXPORT_FILE) as f:
diff --git a/functional_tests/test_feedback_label_system.py b/functional_tests/test_feedback_label_system.py
index 37d0c70db04503b22285e6eec7f6ee303f2bdee6..13a0adf0e5242d0a0e12398f30c37f42100d9d8f 100644
--- a/functional_tests/test_feedback_label_system.py
+++ b/functional_tests/test_feedback_label_system.py
@@ -44,7 +44,6 @@ class FeedbackLabelSystemTest(GradyTestCase):
         self.browser.find_elements_by_class_name('v-color-picker__color')[colour_num].click()
         self.browser.find_element_by_id('create-label-btn').click()
         WebDriverWait(self.browser, 10).until(query_returns_object(FeedbackLabel, name=name))
-        #WebDriverWait(self.browser, 10).until(self.browser.find_element_by_class_name('notification'))
         self.browser.find_element_by_class_name('notification-title').click()
 
     # updates an already existing label with the given arguments
diff --git a/functional_tests/test_login_page.py b/functional_tests/test_login_page.py
index 4ab1d3f217bef9dcd4c839f970cfc2f201b9ac72..002ce2fa328b5bfe473d3a9b1b9bb28ab6d80a00 100644
--- a/functional_tests/test_login_page.py
+++ b/functional_tests/test_login_page.py
@@ -130,7 +130,7 @@ class LoginPageTest(GradyTestCase):
         self.browser.get(self.live_server_url)
         self.browser.find_element_by_id('register').click()
         self.browser.find_element_by_id('gdpr-notice')
-        #self.browser.find_element_by_id('accept-gdpr-notice').click()
+        # self.browser.find_element_by_id('accept-gdpr-notice').click()
         accept_btn = self.browser.find_element_by_id('accept-gdpr-notice')
         ActionChains(self.browser).move_to_element(accept_btn).click().perform()
         username_input = self.browser.find_element_by_id('input-register-username')
diff --git a/functional_tests/test_solution_comments.py b/functional_tests/test_solution_comments.py
index 756f7f99ba74f6fef2a099f9f43df3691493cf0b..0fa7e54f35f9afe488fbab68839e8dd176618525 100644
--- a/functional_tests/test_solution_comments.py
+++ b/functional_tests/test_solution_comments.py
@@ -70,7 +70,7 @@ class TestSolutionComments(GradyTestCase):
         self._write_comment()
         solution_table = self.browser.find_element_by_class_name('solution-table')
         solution_table.find_element_by_class_name('delete-button').click()
-        #self.browser.find_element_by_id('confirm-delete-comment').click()
+        # self.browser.find_element_by_id('confirm-delete-comment').click()
         delete_btn = self.browser.find_element_by_id('confirm-delete-comment')
         ActionChains(self.browser).move_to_element(delete_btn).click().perform()
         WebDriverWait(self.browser, 10).until_not(
@@ -129,7 +129,7 @@ class TestSolutionComments(GradyTestCase):
         sub_types.find_element_by_tag_name('div').click()
         solution_table = self.browser.find_element_by_class_name('solution-table')
         solution_table.find_element_by_class_name('delete-button').click()
-        #self.browser.find_element_by_id('confirm-delete-comment').click()
+        # self.browser.find_element_by_id('confirm-delete-comment').click()
         delete_btn = self.browser.find_element_by_id('confirm-delete-comment')
         ActionChains(self.browser).move_to_element(delete_btn).click().perform()
         WebDriverWait(self.browser, 10).until_not(