diff --git a/src/config.py b/src/config.py
index 5f5560389c3221330700a1108d76b525aedd52a6..a067608f1f3cd499a24c64f8f96211edf7afaad1 100644
--- a/src/config.py
+++ b/src/config.py
@@ -1,15 +1,12 @@
 SECRET_KEY = 'vfdjv423ndf654&%%'
 CELERY_BROKER_URL = 'redis://localhost:6379/0'
 MY_CELERY_RESULT_BACKEND = 'redis://localhost:6379/0'
-TEST_CELERY_BROKER_URL = 'redis://localhost:6379/1'
-TEST_MY_CELERY_RESULT_BACKEND = 'redis://localhost:6379/1'
 CELERY_CONF_WORKER_SEND_TASK_EVENTS = True
 CELERY_CONF_TASK_SEND_SENT_EVENT = True
 SQLALCHEMY_POSTGRES_USER = 'covid19data'
 SQLALCHEMY_POSTGRES_PW = 'covid19datapwd'
 SQLALCHEMY_POSTGRES_URL = 'localhost'
 SQLALCHEMY_POSTGRES_DB = 'covid19data'
-SQLALCHEMY_POSTGRES_DB_TEST = 'covid19datatest'
 SQLALCHEMY_ITEMS_PER_PAGE = 10
 SQLALCHEMY_TRACK_MODIFICATIONS = True
 FLASK_ADMIN_SWATCH = 'superhero'
diff --git a/src/covid19_worker/mq.py b/src/mq.py
similarity index 100%
rename from src/covid19_worker/mq.py
rename to src/mq.py
diff --git a/src/covid19/web.py b/src/web.py
similarity index 100%
rename from src/covid19/web.py
rename to src/web.py
diff --git a/tests/config.py b/tests/config.py
new file mode 100644
index 0000000000000000000000000000000000000000..07fcce92342ce454125a91fe1ca7864996dd6f2f
--- /dev/null
+++ b/tests/config.py
@@ -0,0 +1,14 @@
+SECRET_KEY = 'Aal]JM|?*kgjFZnF'
+CELERY_BROKER_URL = 'redis://localhost:6379/1'
+MY_CELERY_RESULT_BACKEND = 'redis://localhost:6379/1'
+CELERY_CONF_WORKER_SEND_TASK_EVENTS = True
+CELERY_CONF_TASK_SEND_SENT_EVENT = True
+SQLALCHEMY_POSTGRES_USER = 'covid19data'
+SQLALCHEMY_POSTGRES_PW = 'covid19datapwd'
+SQLALCHEMY_POSTGRES_URL = 'localhost'
+SQLALCHEMY_POSTGRES_DB = 'covid19datatest'
+SQLALCHEMY_ITEMS_PER_PAGE = 10
+SQLALCHEMY_TRACK_MODIFICATIONS = True
+FLASK_ADMIN_SWATCH = 'superhero'
+FLASK_APP_DEBUGGER_ACTIVE = True
+PORT = 7070
diff --git a/tests/mq.py b/tests/test_mq.py
similarity index 100%
rename from tests/mq.py
rename to tests/test_mq.py
diff --git a/tests/web.py b/tests/test_web.py
similarity index 100%
rename from tests/web.py
rename to tests/test_web.py