diff --git a/analytical/tests/templatetags/__init__.py b/analytical/tests/templatetags/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/analytical/tests/settings.py b/tests/testproject/settings.py
similarity index 100%
rename from analytical/tests/settings.py
rename to tests/testproject/settings.py
diff --git a/analytical/tests/__init__.py b/tests/testproject/templatetags/__init__.py
similarity index 100%
rename from analytical/tests/__init__.py
rename to tests/testproject/templatetags/__init__.py
diff --git a/analytical/tests/templatetags/dummy.py b/tests/testproject/templatetags/dummy.py
similarity index 100%
rename from analytical/tests/templatetags/dummy.py
rename to tests/testproject/templatetags/dummy.py
diff --git a/analytical/tests/test_tag_analytical.py b/tests/unit/test_tag_analytical.py
similarity index 100%
rename from analytical/tests/test_tag_analytical.py
rename to tests/unit/test_tag_analytical.py
diff --git a/analytical/tests/test_tag_chartbeat.py b/tests/unit/test_tag_chartbeat.py
similarity index 100%
rename from analytical/tests/test_tag_chartbeat.py
rename to tests/unit/test_tag_chartbeat.py
diff --git a/analytical/tests/test_tag_clickmap.py b/tests/unit/test_tag_clickmap.py
similarity index 100%
rename from analytical/tests/test_tag_clickmap.py
rename to tests/unit/test_tag_clickmap.py
diff --git a/analytical/tests/test_tag_clicky.py b/tests/unit/test_tag_clicky.py
similarity index 100%
rename from analytical/tests/test_tag_clicky.py
rename to tests/unit/test_tag_clicky.py
diff --git a/analytical/tests/test_tag_crazy_egg.py b/tests/unit/test_tag_crazy_egg.py
similarity index 100%
rename from analytical/tests/test_tag_crazy_egg.py
rename to tests/unit/test_tag_crazy_egg.py
diff --git a/analytical/tests/test_tag_facebook_pixel.py b/tests/unit/test_tag_facebook_pixel.py
similarity index 100%
rename from analytical/tests/test_tag_facebook_pixel.py
rename to tests/unit/test_tag_facebook_pixel.py
diff --git a/analytical/tests/test_tag_gauges.py b/tests/unit/test_tag_gauges.py
similarity index 100%
rename from analytical/tests/test_tag_gauges.py
rename to tests/unit/test_tag_gauges.py
diff --git a/analytical/tests/test_tag_google_analytics.py b/tests/unit/test_tag_google_analytics.py
similarity index 100%
rename from analytical/tests/test_tag_google_analytics.py
rename to tests/unit/test_tag_google_analytics.py
diff --git a/analytical/tests/test_tag_google_analytics_gtag.py b/tests/unit/test_tag_google_analytics_gtag.py
similarity index 100%
rename from analytical/tests/test_tag_google_analytics_gtag.py
rename to tests/unit/test_tag_google_analytics_gtag.py
diff --git a/analytical/tests/test_tag_google_analytics_js.py b/tests/unit/test_tag_google_analytics_js.py
similarity index 100%
rename from analytical/tests/test_tag_google_analytics_js.py
rename to tests/unit/test_tag_google_analytics_js.py
diff --git a/analytical/tests/test_tag_gosquared.py b/tests/unit/test_tag_gosquared.py
similarity index 100%
rename from analytical/tests/test_tag_gosquared.py
rename to tests/unit/test_tag_gosquared.py
diff --git a/analytical/tests/test_tag_hotjar.py b/tests/unit/test_tag_hotjar.py
similarity index 100%
rename from analytical/tests/test_tag_hotjar.py
rename to tests/unit/test_tag_hotjar.py
diff --git a/analytical/tests/test_tag_hubspot.py b/tests/unit/test_tag_hubspot.py
similarity index 100%
rename from analytical/tests/test_tag_hubspot.py
rename to tests/unit/test_tag_hubspot.py
diff --git a/analytical/tests/test_tag_intercom.py b/tests/unit/test_tag_intercom.py
similarity index 100%
rename from analytical/tests/test_tag_intercom.py
rename to tests/unit/test_tag_intercom.py
diff --git a/analytical/tests/test_tag_kiss_insights.py b/tests/unit/test_tag_kiss_insights.py
similarity index 100%
rename from analytical/tests/test_tag_kiss_insights.py
rename to tests/unit/test_tag_kiss_insights.py
diff --git a/analytical/tests/test_tag_kiss_metrics.py b/tests/unit/test_tag_kiss_metrics.py
similarity index 100%
rename from analytical/tests/test_tag_kiss_metrics.py
rename to tests/unit/test_tag_kiss_metrics.py
diff --git a/analytical/tests/test_tag_matomo.py b/tests/unit/test_tag_matomo.py
similarity index 100%
rename from analytical/tests/test_tag_matomo.py
rename to tests/unit/test_tag_matomo.py
diff --git a/analytical/tests/test_tag_mixpanel.py b/tests/unit/test_tag_mixpanel.py
similarity index 100%
rename from analytical/tests/test_tag_mixpanel.py
rename to tests/unit/test_tag_mixpanel.py
diff --git a/analytical/tests/test_tag_olark.py b/tests/unit/test_tag_olark.py
similarity index 100%
rename from analytical/tests/test_tag_olark.py
rename to tests/unit/test_tag_olark.py
diff --git a/analytical/tests/test_tag_optimizely.py b/tests/unit/test_tag_optimizely.py
similarity index 100%
rename from analytical/tests/test_tag_optimizely.py
rename to tests/unit/test_tag_optimizely.py
diff --git a/analytical/tests/test_tag_performable.py b/tests/unit/test_tag_performable.py
similarity index 100%
rename from analytical/tests/test_tag_performable.py
rename to tests/unit/test_tag_performable.py
diff --git a/analytical/tests/test_tag_piwik.py b/tests/unit/test_tag_piwik.py
similarity index 100%
rename from analytical/tests/test_tag_piwik.py
rename to tests/unit/test_tag_piwik.py
diff --git a/analytical/tests/test_tag_rating_mailru.py b/tests/unit/test_tag_rating_mailru.py
similarity index 100%
rename from analytical/tests/test_tag_rating_mailru.py
rename to tests/unit/test_tag_rating_mailru.py
diff --git a/analytical/tests/test_tag_snapengage.py b/tests/unit/test_tag_snapengage.py
similarity index 100%
rename from analytical/tests/test_tag_snapengage.py
rename to tests/unit/test_tag_snapengage.py
diff --git a/analytical/tests/test_tag_spring_metrics.py b/tests/unit/test_tag_spring_metrics.py
similarity index 100%
rename from analytical/tests/test_tag_spring_metrics.py
rename to tests/unit/test_tag_spring_metrics.py
diff --git a/analytical/tests/test_tag_uservoice.py b/tests/unit/test_tag_uservoice.py
similarity index 100%
rename from analytical/tests/test_tag_uservoice.py
rename to tests/unit/test_tag_uservoice.py
diff --git a/analytical/tests/test_tag_woopra.py b/tests/unit/test_tag_woopra.py
similarity index 100%
rename from analytical/tests/test_tag_woopra.py
rename to tests/unit/test_tag_woopra.py
diff --git a/analytical/tests/test_tag_yandex_metrica.py b/tests/unit/test_tag_yandex_metrica.py
similarity index 100%
rename from analytical/tests/test_tag_yandex_metrica.py
rename to tests/unit/test_tag_yandex_metrica.py
diff --git a/analytical/tests/test_utils.py b/tests/unit/test_utils.py
similarity index 100%
rename from analytical/tests/test_utils.py
rename to tests/unit/test_utils.py
diff --git a/analytical/tests/utils.py b/tests/unit/utils.py
similarity index 100%
rename from analytical/tests/utils.py
rename to tests/unit/utils.py