diff --git a/pytest.ini b/pytest.ini
index 8a281f0..86c3827 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,2 +1,3 @@
 [pytest]
 addopts = --pylint
+norecursedirs = _work_
diff --git a/vasl_templates/server_settings.py b/vasl_templates/server_settings.py
index 8c85976..c4e5e58 100644
--- a/vasl_templates/server_settings.py
+++ b/vasl_templates/server_settings.py
@@ -235,7 +235,7 @@ def install_server_settings( is_startup ):
     """Install the server settings."""
 
     # install the server settings
-    from vasl_templates.webapp import app as app
+    from vasl_templates.webapp import app
     for key in SERVER_SETTINGS:
         key2 = key.replace( "-", "_" ).upper()
         app.config[ key2 ] = app_settings.value( "ServerSettings/"+key )
diff --git a/vasl_templates/webapp/tests/test_capabilities.py b/vasl_templates/webapp/tests/test_capabilities.py
index 0cca6e4..22252f2 100644
--- a/vasl_templates/webapp/tests/test_capabilities.py
+++ b/vasl_templates/webapp/tests/test_capabilities.py
@@ -528,7 +528,7 @@ def test_custom_capabilities( webapp, webdriver ): #pylint: disable=too-many-sta
     vehicles_sortable = find_child( "#ob_vehicles-sortable_1" )
     elems = find_children( "li", vehicles_sortable )
     assert len(elems) == 1
-    ActionChains(webdriver).double_click( elems[0] ).perform()
+    ActionChains( webdriver ).double_click( elems[0] ).perform()
     elems = check_capabilities_in_dialog( [ "QSU", "cs 4 <small><i>(brew up)</i></small>" ] )
 
     # edit one of the capabilities
@@ -537,7 +537,8 @@ def test_custom_capabilities( webapp, webdriver ): #pylint: disable=too-many-sta
     elem.send_keys( "QSU (modified)" )
 
     # delete a capability
-    ActionChains(webdriver).key_down( Keys.CONTROL ).click( elems[1] ).key_up( Keys.CONTROL ).perform()
+    ActionChains( webdriver ).key_down( Keys.CONTROL ).click( elems[1] ).perform()
+    ActionChains( webdriver ).key_up( Keys.CONTROL ).perform()
 
     # add a new capability
     elem = find_child( "#vo_capabilities-add" )
@@ -564,12 +565,13 @@ def test_custom_capabilities( webapp, webdriver ): #pylint: disable=too-many-sta
     # make sure the capabilities are loaded correcly when editing the vehicle
     elems = find_children( "li", vehicles_sortable )
     assert len(elems) == 1
-    ActionChains(webdriver).double_click( elems[0] ).perform()
+    ActionChains( webdriver ).double_click( elems[0] ).perform()
     elems = check_capabilities_in_dialog( [ "QSU (modified)", "a <i>new</i> capability" ] )
 
     # delete all capabilities
     for elem in elems:
-        ActionChains(webdriver).key_down( Keys.CONTROL ).click( elem ).key_up( Keys.CONTROL ).perform()
+        ActionChains( webdriver ).key_down( Keys.CONTROL ).click( elem ).perform()
+        ActionChains( webdriver ).key_up( Keys.CONTROL ).perform()
     click_dialog_button( "OK" )
     check_snippet( "" )
 
@@ -583,7 +585,7 @@ def test_custom_capabilities( webapp, webdriver ): #pylint: disable=too-many-sta
     select_tab( "ob1" )
     elems = find_children( "li", vehicles_sortable )
     assert len(elems) == 1
-    ActionChains(webdriver).double_click( elems[0] ).perform()
+    ActionChains( webdriver ).double_click( elems[0] ).perform()
     btn = find_child( "#vo_capabilities-reset" )
     btn.click()
     click_dialog_button( "OK" )
@@ -599,7 +601,7 @@ def test_custom_capabilities( webapp, webdriver ): #pylint: disable=too-many-sta
     select_tab( "ob1" )
     elems = find_children( "li", vehicles_sortable )
     assert len(elems) == 1
-    ActionChains(webdriver).double_click( elems[0] ).perform()
+    ActionChains( webdriver ).double_click( elems[0] ).perform()
     elems = find_children( "#vo_capabilities-sortable input[type='text']" )
     assert len(elems) == 2
     elems[0].clear()
@@ -650,7 +652,7 @@ def test_custom_comments( webapp, webdriver ): #pylint: disable=too-many-stateme
     vehicles_sortable = find_child( "#ob_vehicles-sortable_1" )
     elems = find_children( "li", vehicles_sortable )
     assert len(elems) == 1
-    ActionChains(webdriver).double_click( elems[0] ).perform()
+    ActionChains( webdriver ).double_click( elems[0] ).perform()
     elems = check_comments_in_dialog( [ "a comment", "another comment" ] )
 
     # edit one of the comments
@@ -659,7 +661,8 @@ def test_custom_comments( webapp, webdriver ): #pylint: disable=too-many-stateme
     elem.send_keys( "a comment (modified)" )
 
     # delete a comment
-    ActionChains(webdriver).key_down( Keys.CONTROL ).click( elems[1] ).key_up( Keys.CONTROL ).perform()
+    ActionChains( webdriver ).key_down( Keys.CONTROL ).click( elems[1] ).perform()
+    ActionChains( webdriver ).key_up( Keys.CONTROL ).perform()
 
     # add a new comment
     elem = find_child( "#vo_comments-add" )
@@ -686,12 +689,13 @@ def test_custom_comments( webapp, webdriver ): #pylint: disable=too-many-stateme
     # make sure the comments are loaded correcly when editing the vehicle
     elems = find_children( "li", vehicles_sortable )
     assert len(elems) == 1
-    ActionChains(webdriver).double_click( elems[0] ).perform()
+    ActionChains( webdriver ).double_click( elems[0] ).perform()
     elems = check_comments_in_dialog( [ "a comment (modified)", "a <i>new</i> comment" ] )
 
     # delete all comments
     for elem in elems:
-        ActionChains(webdriver).key_down( Keys.CONTROL ).click( elem ).key_up( Keys.CONTROL ).perform()
+        ActionChains( webdriver ).key_down( Keys.CONTROL ).click( elem ).perform()
+        ActionChains( webdriver ).key_up( Keys.CONTROL ).perform()
     click_dialog_button( "OK" )
     check_snippet( "" )
 
@@ -705,7 +709,7 @@ def test_custom_comments( webapp, webdriver ): #pylint: disable=too-many-stateme
     select_tab( "ob1" )
     elems = find_children( "li", vehicles_sortable )
     assert len(elems) == 1
-    ActionChains(webdriver).double_click( elems[0] ).perform()
+    ActionChains( webdriver ).double_click( elems[0] ).perform()
     btn = find_child( "#vo_comments-reset" )
     btn.click()
     click_dialog_button( "OK" )
@@ -721,7 +725,7 @@ def test_custom_comments( webapp, webdriver ): #pylint: disable=too-many-stateme
     select_tab( "ob1" )
     elems = find_children( "li", vehicles_sortable )
     assert len(elems) == 1
-    ActionChains(webdriver).double_click( elems[0] ).perform()
+    ActionChains( webdriver ).double_click( elems[0] ).perform()
     elems = find_children( "#vo_comments-sortable input[type='text']" )
     assert len(elems) == 2
     elems[0].clear()
@@ -803,7 +807,7 @@ def test_capability_updates_in_ui( webapp, webdriver ):
     vehicles_sortable = find_child( "#ob_vehicles-sortable_1" )
     elems = find_children( "li", vehicles_sortable )
     assert len(elems) == 2
-    ActionChains(webdriver).double_click( elems[1] ).perform()
+    ActionChains( webdriver ).double_click( elems[1] ).perform()
     elem = find_child( "#vo_capabilities-add" )
     elem.click()
     elems = find_children( "#vo_capabilities-sortable input[type='text']" )
@@ -930,7 +934,7 @@ def test_elite( webapp, webdriver ): #pylint: disable=too-many-statements
     check_elite( False, False )
 
     # add a custom capability
-    ActionChains(webdriver).double_click( get_sortable_elem() ).perform()
+    ActionChains( webdriver ).double_click( get_sortable_elem() ).perform()
     elem = find_child( "#vo_capabilities-add" )
     elem.click()
     elems = find_children( "#vo_capabilities-sortable input[type='text']" )
@@ -939,7 +943,7 @@ def test_elite( webapp, webdriver ): #pylint: disable=too-many-statements
     click_dialog_button( "OK" )
 
     # make the vehicle elite
-    ActionChains(webdriver).double_click( get_sortable_elem() ).perform()
+    ActionChains( webdriver ).double_click( get_sortable_elem() ).perform()
     check_elite2( False, True )
     elem = find_child( "#edit-vo .capabilities .elite" )
     elem.click()
@@ -959,7 +963,7 @@ def test_elite( webapp, webdriver ): #pylint: disable=too-many-statements
     check_elite( True, True )
 
     # make the vehicle non-elite
-    ActionChains(webdriver).double_click( get_sortable_elem() ).perform()
+    ActionChains( webdriver ).double_click( get_sortable_elem() ).perform()
     check_elite2( True, True )
     elem = find_child( "#edit-vo .capabilities .elite" )
     elem.click()
@@ -975,14 +979,15 @@ def test_elite( webapp, webdriver ): #pylint: disable=too-many-statements
         [ "A6<sup>2</sup>", "M7\u2020", "sD7", "CS 6", "HE10" ]
 
     # make the vehicle elite, remove the custom capability
-    ActionChains(webdriver).double_click( get_sortable_elem() ).perform()
+    ActionChains( webdriver ).double_click( get_sortable_elem() ).perform()
     check_elite2( False, True )
     elem = find_child( "#edit-vo .capabilities .elite" )
     elem.click()
     check_elite2( True, True )
     elems = find_children( "#vo_capabilities-sortable li" )
     webdriver.execute_script( "arguments[0].scrollIntoView(true);", elems[4] )
-    ActionChains(webdriver).key_down( Keys.CONTROL ).click( elems[4] ).key_up( Keys.CONTROL ).perform()
+    ActionChains( webdriver ).key_down( Keys.CONTROL ).click( elems[4] ).perform()
+    ActionChains( webdriver ).key_up( Keys.CONTROL ).perform()
     click_dialog_button( "OK" )
     check_elite( True, False )
 
@@ -997,7 +1002,7 @@ def test_elite( webapp, webdriver ): #pylint: disable=too-many-statements
     check_elite( True, False )
 
     # make the vehicle non-elite
-    ActionChains(webdriver).double_click( get_sortable_elem() ).perform()
+    ActionChains( webdriver ).double_click( get_sortable_elem() ).perform()
     check_elite2( True, False )
     elem = find_child( "#edit-vo .capabilities .elite" )
     elem.click()
diff --git a/vasl_templates/webapp/tests/test_snippets.py b/vasl_templates/webapp/tests/test_snippets.py
index c23efd8..1d68026 100644
--- a/vasl_templates/webapp/tests/test_snippets.py
+++ b/vasl_templates/webapp/tests/test_snippets.py
@@ -349,11 +349,8 @@ def test_snippet_images( webapp, webdriver ):
         webdriver.execute_script( "arguments[0].value = arguments[1]", ret_buffer, "" )
 
         # shift-click the snippet button
-        ActionChains( webdriver ) \
-            .key_down( Keys.SHIFT ) \
-            .click( snippet_btn ) \
-            .key_up( Keys.SHIFT ) \
-            .perform()
+        ActionChains( webdriver ).key_down( Keys.SHIFT ).click( snippet_btn ).perform()
+        ActionChains( webdriver ).key_up( Keys.SHIFT ).perform()
 
         # wait for the snippet image to be generated
         wait_for( 20, lambda: ret_buffer.get_attribute( "value" ) )
diff --git a/vasl_templates/webapp/tests/utils.py b/vasl_templates/webapp/tests/utils.py
index a2f5cdd..122b136 100644
--- a/vasl_templates/webapp/tests/utils.py
+++ b/vasl_templates/webapp/tests/utils.py
@@ -470,7 +470,7 @@ def _do_select_droplist( sel, val ):
 
 def get_droplist_vals_index( sel ):
     """Get the value/text for each option in a droplist."""
-    return { k: v for k,v in get_droplist_vals(sel) }
+    return dict( get_droplist_vals( sel ) )
 
 def get_droplist_vals( sel ):
     """Get the value/text for each option in a droplist."""