All tests passing and merged with master.

tests/__init__.py

@@ -1,6 +1,5 @@
 from flask.testing import FlaskClient
 from flask import url_for
-from app.main.dao import (users_dao)
 
 
 class TestClient(FlaskClient):
@@ -52,6 +51,7 @@ TEST_USER_EMAIL = 'test@user.gov.uk'
 
 
 def create_test_user(state):
+    from app.main.dao import users_dao
     user = None
     users_dao.insert_user(user)
     return user
@@ -71,10 +71,12 @@ def create_test_api_user(state):
 
 
 def create_another_test_user(state):
+    from app.main.dao import users_dao
     user = None
     users_dao.insert_user(user)
     return user
 
 
 def get_test_user():
+    from app.main.dao import users_dao
     return users_dao.get_user_by_email(TEST_USER_EMAIL)