diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..91d39213
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,71 @@
+name: Django CI
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 4
+      matrix:
+        python-version: [3.7.5]
+
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          DB_DATABASE: python_blogs
+          DB_USER: root
+          DB_PASSWORD:
+        ports: ['3306:3306']
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Cache
+      uses: actions/cache@v2
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+        restore-keys: |
+          ${{ runner.os }}-pip-
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v3
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install Dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+    - name: Copy settings
+      run: |
+        cp settings_local.py.template settings_local.py
+
+    - name: Set up MySql
+      run: |
+        sudo service mysql start
+        sudo mysql -uroot -proot -e 'CREATE DATABASE python_blogs;'
+    - name: Run Migrations
+      run: |
+        python manage.py migrate
+        python manage.py loaddata data.json
+      env: 
+        DBENGINE: django.db.backends.mysql
+        DBNAME: python_blogs
+        DBUSER: root
+        DBPASSWORD: 
+        DBHOST: 127.0.0.1
+        DBPORT: $
+    - name: Run Tests
+      run: |
+        python manage.py test
+      env: 
+        DBENGINE: django.db.backends.mysql
+        DBNAME: python_blogs
+        DBUSER: root
+        DBPASSWORD: 
+        DBHOST: 127.0.0.1
+        DBPORT: $
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 8900f715..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-dist: xenial
-language: python
-cache: pip
-python:
-  - "3.7.3"
-install:
-  - pip install -r requirements.txt
-before_script:
-  - cp settings_local.py.template settings_local.py
-script:
-  - python manage.py test
diff --git a/aldryn_newsblog/tests/test_admin.py b/aldryn_newsblog/tests/test_admin.py
deleted file mode 100644
index 858a64bb..00000000
--- a/aldryn_newsblog/tests/test_admin.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
-from django.test import TransactionTestCase
-
-from aldryn_people.models import Person
-
-from aldryn_newsblog.cms_appconfig import NewsBlogConfig
-from aldryn_newsblog.models import Article
-
-from . import NewsBlogTestsMixin
-
-
-class AdminTest(NewsBlogTestsMixin, TransactionTestCase):
-
-    def test_admin_owner_default(self):
-        from django.contrib import admin
-        admin.autodiscover()
-        # since we now have data migration to create the default
-        # NewsBlogConfig (if migrations were not faked, django >1.7)
-        # we need to delete one of configs to be sure that it is pre selected
-        # in the admin view.
-        if NewsBlogConfig.objects.count() > 1:
-            # delete the app config that was created during test set up.
-            NewsBlogConfig.objects.filter(namespace='NBNS').delete()
-        user = self.create_user()
-        user.is_superuser = True
-        user.save()
-
-        Person.objects.create(user=user, name=u' '.join(
-            (user.first_name, user.last_name)))
-
-        admin_inst = admin.site._registry[Article]
-        self.request = self.get_request('en')
-        self.request.user = user
-        self.request.META['HTTP_HOST'] = 'example.com'
-        response = admin_inst.add_view(self.request)
-        option = r'<option value="{}" (selected="selected"|selected)>%s<\/option>'.format(
-            user.pk,
-        )
-        self.assertRegexpMatches(response.rendered_content, option % user.username)
-        self.assertRegexpMatches(response.rendered_content, option % user.get_full_name())
diff --git a/aldryn_newsblog/tests/test_feeds.py b/aldryn_newsblog/tests/test_feeds.py
deleted file mode 100644
index 9e16e203..00000000
--- a/aldryn_newsblog/tests/test_feeds.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
-from datetime import timedelta
-
-from django.test import TransactionTestCase
-from django.urls import reverse
-from django.utils.timezone import now
-from django.utils.translation import override
-
-from aldryn_newsblog.feeds import CategoryFeed, LatestArticlesFeed, TagFeed
-
-from . import NewsBlogTestsMixin
-
-
-class TestFeeds(NewsBlogTestsMixin, TransactionTestCase):
-
-    def test_latest_feeds(self):
-        article = self.create_article()
-        future_article = self.create_article(
-            publishing_date=now() + timedelta(days=3),
-            is_published=True,
-        )
-        url = reverse(
-            '{0}:article-list-feed'.format(self.app_config.namespace)
-        )
-        self.request = self.get_request('en', url)
-        self.request.current_page = self.page
-        feed = LatestArticlesFeed()(self.request)
-
-        self.assertContains(feed, article.title)
-        self.assertNotContains(feed, future_article.title)
-
-    def test_tag_feed(self):
-        articles = self.create_tagged_articles()
-
-        url = reverse(
-            '{0}:article-list-by-tag-feed'.format(self.app_config.namespace),
-            args=['tag1']
-        )
-        self.request = self.get_request('en', url)
-        if getattr(self.request, 'current_page', None) is None:
-            self.request.current_page = self.page
-        feed = TagFeed()(self.request, 'tag1')
-
-        for article in articles['tag1']:
-            self.assertContains(feed, article.title)
-        for different_tag_article in articles['tag2']:
-            self.assertNotContains(feed, different_tag_article.title)
-
-    def test_category_feed(self):
-        lang = self.category1.get_current_language()
-        with override(lang):
-            article = self.create_article()
-            article.categories.add(self.category1)
-            different_category_article = self.create_article()
-            different_category_article.categories.add(self.category2)
-            url = reverse(
-                '{0}:article-list-by-category-feed'.format(
-                    self.app_config.namespace),
-                args=[self.category1.slug]
-            )
-            self.request = self.get_request(lang, url)
-            if getattr(self.request, 'current_page', None) is None:
-                self.request.current_page = self.page
-
-            feed = CategoryFeed()(self.request, self.category1.slug)
-
-            self.assertContains(feed, article.title)
-            self.assertNotContains(feed, different_category_article.title)
diff --git a/aldryn_newsblog/tests/test_i18n.py b/aldryn_newsblog/tests/test_i18n.py
deleted file mode 100644
index b3de9798..00000000
--- a/aldryn_newsblog/tests/test_i18n.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
-from django.urls import NoReverseMatch
-from django.utils.translation import override
-
-from . import NewsBlogTestCase
-
-
-class TestI18N(NewsBlogTestCase):
-
-    def test_absolute_url_fallback(self):
-        # Create an EN article
-        with override('en'):
-            article = self.create_article(
-                title='God Save the Queen!', slug='god-save-queen')
-        # Add a DE translation
-        article.create_translation('de',
-            title='Einigkeit und Recht und Freiheit!',
-            slug='einigkeit-und-recht-und-freiheit')
-
-        # Reload for good measure
-        article = self.reload(article)
-
-        self.assertEquals(article.get_absolute_url(language='en'),
-            '/en/page/god-save-queen/')
-        # Test that we can request the other defined language too
-        self.assertEquals(article.get_absolute_url(language='de'),
-            '/de/page/einigkeit-und-recht-und-freiheit/')
-
-        # Now, let's request a language that article has not yet been translated
-        # to, but has fallbacks defined, we should get EN
-        self.assertEquals(article.get_absolute_url(language='fr'),
-            '/en/page/god-save-queen/')
-
-        # With settings changed to 'redirect_on_fallback': False, test again.
-        with self.settings(CMS_LANGUAGES=self.NO_REDIRECT_CMS_SETTINGS):
-            self.assertEquals(article.get_absolute_url(language='fr'),
-                '/fr/page/god-save-queen/')
-
-        # Now, let's request a language that has a fallback defined, but it is
-        # not available either (should raise NoReverseMatch)
-        with self.assertRaises(NoReverseMatch):
-            article.get_absolute_url(language='it')
diff --git a/aldryn_newsblog/tests/test_models.py b/aldryn_newsblog/tests/test_models.py
deleted file mode 100644
index ca50574b..00000000
--- a/aldryn_newsblog/tests/test_models.py
+++ /dev/null
@@ -1,244 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
-import os
-
-from django.conf import settings
-from django.utils.timezone import now
-from django.utils.translation import activate, override
-
-from cms import api
-
-from aldryn_newsblog.models import Article
-
-from . import TESTS_STATIC_ROOT, NewsBlogTestCase, NewsBlogTransactionTestCase
-
-
-FEATURED_IMAGE_PATH = os.path.join(TESTS_STATIC_ROOT, 'featured_image.jpg')
-
-
-class TestModels(NewsBlogTestCase):
-
-    def test_create_article(self):
-        article = self.create_article()
-        response = self.client.get(article.get_absolute_url())
-        self.assertContains(response, article.title)
-
-    def test_delete_article(self):
-        article = self.create_article()
-        article_pk = article.pk
-        article_url = article.get_absolute_url()
-        response = self.client.get(article_url)
-        self.assertContains(response, article.title)
-        Article.objects.get(pk=article_pk).delete()
-        response = self.client.get(article_url)
-        self.assertEqual(response.status_code, 404)
-
-    def test_auto_slugifies(self):
-        activate(self.language)
-        title = u'This is a title'
-        author = self.create_person()
-        article = Article.objects.create(
-            title=title, author=author, owner=author.user,
-            app_config=self.app_config, publishing_date=now(),
-            is_published=True,
-        )
-        article.save()
-        self.assertEquals(article.slug, 'this-is-a-title')
-        # Now, let's try another with the same title
-        article_1 = Article(
-            title=title.lower(),
-            author=author,
-            owner=author.user,
-            app_config=self.app_config,
-            publishing_date=now(),
-            is_published=True,
-        )
-        # Note, it cannot be the exact same title, else we'll fail the unique
-        # constraint on the field.
-        article_1.save()
-        # Note that this should be "incremented" slug here.
-        self.assertEquals(article_1.slug, 'this-is-a-title-1')
-        article_2 = Article(
-            title=title.upper(),
-            author=author,
-            owner=author.user,
-            app_config=self.app_config,
-            publishing_date=now(),
-            is_published=True,
-        )
-        article_2.save()
-        self.assertEquals(article_2.slug, 'this-is-a-title-2')
-
-    def test_auto_existing_author(self):
-        author = self.create_person()
-        article = Article.objects.create(
-            title=self.rand_str(), owner=author.user,
-            app_config=self.app_config, publishing_date=now(),
-            is_published=True,
-        )
-        article.save()
-        self.assertEquals(article.author.user, article.owner)
-
-        old = self.app_config.create_authors
-        self.app_config.create_authors = False
-        self.app_config.save()
-        article = Article.objects.create(
-            title=self.rand_str(), owner=author.user,
-            app_config=self.app_config, publishing_date=now(),
-            is_published=True,
-        )
-        self.app_config.create_authors = old
-        self.app_config.save()
-        self.assertEquals(article.author, None)
-
-    def test_auto_new_author(self):
-        user = self.create_user()
-        article = Article.objects.create(
-            title=self.rand_str(), owner=user,
-            app_config=self.app_config, publishing_date=now(),
-            is_published=True,
-        )
-        article.save()
-        self.assertEquals(article.author.name,
-                          u' '.join((user.first_name, user.last_name)))
-
-    def test_auto_search_data(self):
-        activate(self.language)
-
-        user = self.create_user()
-
-        lead_in = 'Hello! this text will be searchable.'
-
-        Article.update_search_on_save = True
-
-        article = Article.objects.create(
-            title=self.rand_str(),
-            owner=user,
-            lead_in=lead_in,
-            app_config=self.app_config,
-            publishing_date=now(),
-            is_published=True,
-        )
-        article.save()
-
-        search_data = article.get_search_data()
-
-        self.assertEquals(lead_in, search_data)
-        self.assertEquals(article.search_data, search_data)
-
-    def test_auto_search_data_off(self):
-        activate(self.language)
-        user = self.create_user()
-
-        lead_in = 'Hello! this text will not be searchable.'
-
-        Article.update_search_on_save = False
-
-        article = Article.objects.create(
-            title=self.rand_str(),
-            owner=user,
-            lead_in=lead_in,
-            app_config=self.app_config,
-            publishing_date=now(),
-            is_published=True,
-        )
-        article.save()
-
-        search_data = article.get_search_data()
-
-        # set it back to true
-        Article.update_search_on_save = True
-
-        self.assertEquals(lead_in, search_data)
-        self.assertNotEquals(article.search_data, search_data)
-
-    def test_has_content(self):
-        # Just make sure we have a known language
-        activate(self.language)
-        title = self.rand_str()
-        content = self.rand_str()
-        author = self.create_person()
-        article = Article.objects.create(
-            title=title, slug=self.rand_str(), author=author, owner=author.user,
-            app_config=self.app_config, publishing_date=now(),
-            is_published=True,
-        )
-        article.save()
-        api.add_plugin(article.content, 'TextPlugin', self.language)
-        plugin = article.content.get_plugins()[0].get_plugin_instance()[0]
-        plugin.body = content
-        plugin.save()
-        response = self.client.get(article.get_absolute_url())
-        self.assertContains(response, title)
-        self.assertContains(response, content)
-
-    def test_change_title(self):
-        """
-        Test that we can change the title of an existing, published article
-        without issue. Also ensure that the slug does NOT change when changing
-        the title alone.
-        """
-        activate(self.language)
-        initial_title = "This is the initial title"
-        initial_slug = "this-is-the-initial-title"
-        author = self.create_person()
-        article = Article.objects.create(
-            title=initial_title, author=author, owner=author.user,
-            app_config=self.app_config, publishing_date=now(),
-            is_published=True,
-        )
-        article.save()
-        self.assertEquals(article.title, initial_title)
-        self.assertEquals(article.slug, initial_slug)
-        # Now, let's try to change the title
-        new_title = "This is the new title"
-        article.title = new_title
-        article.save()
-        article = self.reload(article)
-        self.assertEquals(article.title, new_title)
-        self.assertEquals(article.slug, initial_slug)
-
-
-class TestModelsTransactions(NewsBlogTransactionTestCase):
-
-    def test_duplicate_title_and_language(self):
-        """
-        Test that if user attempts to create an article with the same name and
-        in the same language as another, it will not raise exceptions.
-        """
-        title = "Sample Article"
-        author = self.create_person()
-        original_lang = settings.LANGUAGES[0][0]
-        # Create an initial article in the first language
-        article1 = Article(
-            title=title, author=author, owner=author.user,
-            app_config=self.app_config, publishing_date=now(),
-            is_published=True,
-        )
-        article1.set_current_language(original_lang)
-        article1.save()
-
-        # Now try to create an article with the same title in every possible
-        # language and every possible language contexts.
-        for context_lang, _ in settings.LANGUAGES:
-            with override(context_lang):
-                for article_lang, _ in settings.LANGUAGES:
-                    try:
-                        article = Article(
-                            author=author, owner=author.user,
-                            app_config=self.app_config, publishing_date=now(),
-                            is_published=True,
-                        )
-                        article.set_current_language(article_lang)
-                        article.title = title
-                        article.save()
-                    except Exception:
-                        self.fail('Creating article in process context "{0}" '
-                            'and article language "{1}" with identical name '
-                            'as another "{2}" article raises exception'.format(
-                                context_lang,
-                                article_lang,
-                                original_lang,
-                            ))
diff --git a/aldryn_newsblog/tests/test_plugins.py b/aldryn_newsblog/tests/test_plugins.py
deleted file mode 100644
index ef724318..00000000
--- a/aldryn_newsblog/tests/test_plugins.py
+++ /dev/null
@@ -1,413 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
-import datetime
-import time
-
-from django.core.cache import cache
-from django.urls import reverse
-from django.utils.encoding import force_text
-from django.utils.translation import override
-
-from cms import api
-from cms.models import StaticPlaceholder
-
-import pytz
-
-from aldryn_newsblog.models import NewsBlogConfig
-
-from . import NewsBlogTestCase
-
-
-class TestAppConfigPluginsBase(NewsBlogTestCase):
-    plugin_to_test = 'TextPlugin'
-    plugin_params = {}
-
-    def setUp(self):
-        super(TestAppConfigPluginsBase, self).setUp()
-        self.placeholder = self.plugin_page.placeholders.all()[0]
-        api.add_plugin(
-            self.placeholder, self.plugin_to_test, self.language,
-            app_config=self.app_config, **self.plugin_params)
-        self.plugin = self.placeholder.get_plugins()[0].get_plugin_instance()[0]
-        self.plugin.save()
-        self.plugin_page.publish(self.language)
-        self.another_app_config = NewsBlogConfig.objects.create(
-            namespace=self.rand_str())
-
-
-class TestPluginLanguageHelperMixin(object):
-    def _test_plugin_languages_with_article(self, article):
-        """Set up conditions to test plugin languages edge cases"""
-        # Add 'de' translation to one of the articles
-        title_de = 'title-de'
-        title_en = article.title
-        article.set_current_language('de')
-        article.title = title_de
-        article.save()
-
-        # Unpublish page with newsblog apphook
-        self.page.unpublish('en')
-        cache.clear()
-        response = self.client.get(self.plugin_page.get_absolute_url())
-
-        # This article should not be visible on 'en' page/plugin
-        self.assertNotContains(response, title_en)
-
-
-class TestArchivePlugin(TestAppConfigPluginsBase):
-    plugin_to_test = 'NewsBlogArchivePlugin'
-
-    def test_archive_plugin(self):
-        dates = [
-            datetime.datetime(2014, 11, 15, 12, 0, 0, 0, pytz.UTC),
-            datetime.datetime(2014, 11, 16, 12, 0, 0, 0, pytz.UTC),
-            datetime.datetime(2015, 1, 15, 12, 0, 0, 0, pytz.UTC),
-            datetime.datetime(2015, 1, 15, 12, 0, 0, 0, pytz.UTC),
-            datetime.datetime(2015, 1, 15, 12, 0, 0, 0, pytz.UTC),
-            datetime.datetime(2015, 2, 15, 12, 0, 0, 0, pytz.UTC),
-        ]
-        articles = []
-        for d in dates:
-            article = self.create_article(publishing_date=d)
-            articles.append(article)
-        response = self.client.get(self.plugin_page.get_absolute_url())
-        response_content = force_text(response.content)
-        needle = '<a href="/en/page/{year}/{month}/"[^>]*>'
-        '[^<]*<span class="badge">{num}</span>'
-        month1 = needle.format(year=2014, month=11, num=2)
-        month2 = needle.format(year=2015, month=2, num=1)
-        month3 = needle.format(year=2015, month=1, num=3)
-        self.assertRegexpMatches(response_content, month1)
-        self.assertRegexpMatches(response_content, month2)
-        self.assertRegexpMatches(response_content, month3)
-
-
-class TestArticleSearchPlugin(TestAppConfigPluginsBase):
-    """Simply tests that the plugin form renders on the page."""
-    # This is a really weak test. To do more, we'll have to submit the form,
-    # yadda yadda yadda. Test_views.py should already test the other side of
-    # this.
-    plugin_to_test = 'NewsBlogArticleSearchPlugin'
-    plugin_params = {
-        "max_articles": 5,
-    }
-
-    def test_article_search_plugin(self):
-        needle = '<input type="hidden" name="max_articles" value="{num}">'
-        response = self.client.get(self.plugin_page.get_absolute_url())
-        self.assertContains(response, needle.format(num=5))
-
-
-class TestAuthorsPlugin(TestAppConfigPluginsBase):
-    plugin_to_test = 'NewsBlogAuthorsPlugin'
-
-    def test_authors_plugin(self):
-        author1, author2 = self.create_person(), self.create_person()
-        # Published, author1 articles in our current namespace
-        author1_articles = []
-        for _ in range(3):
-            article = self.create_article(author=author1)
-            author1_articles.append(article)
-
-        # Published, author2 articles in our current namespace
-        other_articles = []
-        for _ in range(5):
-            article = self.create_article(author=author2)
-            other_articles.append(article)
-
-        # Unpublished, author1 articles in our current namespace
-        for _ in range(7):
-            article = self.create_article(
-                author=author1,
-                is_published=False
-            )
-            other_articles.append(article)
-
-        # Published, author1 articles in a different namespace
-        other_articles.append(self.create_article(
-            author=author1,
-            app_config=self.another_app_config
-        ))
-
-        # REQUIRED DUE TO USE OF RAW QUERIES
-        time.sleep(1)
-
-        response = self.client.get(self.plugin_page.get_absolute_url())
-        response_content = force_text(response.content)
-        # This pattern tries to accommodate all the templates from all the
-        # versions of this package.
-        pattern = '<a href="{url}">\s*</a>'  # noqa: #W605
-        author1_pattern = pattern.format(
-            url=reverse(
-                '{0}:article-list-by-author'.format(self.app_config.namespace),
-                args=[author1.slug]
-            )
-        )
-        author2_pattern = pattern.format(
-            url=reverse(
-                '{0}:article-list-by-author'.format(self.app_config.namespace),
-                args=[author2.slug]
-            )
-        )
-        self.assertRegexpMatches(response_content, author1_pattern)
-        self.assertRegexpMatches(response_content, author2_pattern)
-
-
-class TestCategoriesPlugin(TestAppConfigPluginsBase):
-    plugin_to_test = 'NewsBlogCategoriesPlugin'
-
-    def test_categories_plugin(self):
-        # Published, category1 articles in our current namespace
-        cat1_articles = []
-        for _ in range(3):
-            article = self.create_article()
-            article.categories.add(self.category1)
-            cat1_articles.append(article)
-
-        # Published category2 articles in our namespace
-        other_articles = []
-        for _ in range(5):
-            article = self.create_article()
-            article.categories.add(self.category2)
-            other_articles.append(article)
-
-        # Some tag1, but unpublished articles
-        for _ in range(7):
-            article = self.create_article(is_published=False)
-            article.categories.add(self.category1)
-            other_articles.append(article)
-
-        # Some tag1 articles in another namespace
-        for _ in range(1):
-            article = self.create_article(app_config=self.another_app_config)
-            article.categories.add(self.category1)
-            other_articles.append(article)
-
-        # REQUIRED DUE TO USE OF RAW QUERIES
-        time.sleep(1)
-
-        response = self.client.get(self.plugin_page.get_absolute_url())
-        response_content = force_text(response.content)
-        # We use two different patterns in alternation because different
-        # versions of newsblog have different templates
-        pattern = '<span[^>]*>{num}</span>\s*<a href=[^>]*>{name}</a>'  # noqa: #W605
-        pattern += '|<a href=[^>]*>{name}</a>\s*<span[^>]*>{num}</span>'  # noqa: #W605
-        needle1 = pattern.format(num=3, name=self.category1.name)
-        needle2 = pattern.format(num=5, name=self.category2.name)
-        self.assertRegexpMatches(response_content, needle1)
-        self.assertRegexpMatches(response_content, needle2)
-
-
-class TestFeaturedArticlesPlugin(TestPluginLanguageHelperMixin,
-                                 TestAppConfigPluginsBase):
-    plugin_to_test = 'NewsBlogFeaturedArticlesPlugin'
-    plugin_params = {
-        "article_count": 5,
-    }
-
-    def test_featured_articles_plugin(self):
-        featured_articles = [self.create_article(
-            is_featured=True,
-            is_published=True
-        ) for _ in range(3)]
-        # Some featured articles but unpublished articles
-        other_articles = [self.create_article(
-            is_featured=True,
-            is_published=False
-        ) for _ in range(3)]
-        # Some non-featured articles in the same namespace
-        other_articles += [self.create_article() for _ in range(3)]
-        # Some featured articles in another namespace
-        other_articles += [self.create_article(
-            is_featured=True,
-            app_config=self.another_app_config
-        ) for _ in range(3)]
-
-        response = self.client.get(self.plugin_page.get_absolute_url())
-        for article in featured_articles:
-            self.assertContains(response, article.title)
-        for article in other_articles:
-            self.assertNotContains(response, article.title)
-
-    def test_featured_articles_plugin_unpublished_app_page(self):
-        with override(self.language):
-            articles = [self.create_article(is_featured=True)
-                        for _ in range(3)]
-
-        response = self.client.get(self.plugin_page.get_absolute_url())
-        for article in articles:
-            self.assertContains(response, article.title)
-
-        self.page.unpublish(self.language)
-        self.reload_urls()
-        cache.clear()
-        response = self.client.get(self.plugin_page.get_absolute_url())
-        for article in articles:
-            self.assertNotContains(response, article.title)
-
-    def test_featured_articles_plugin_language(self):
-        article = self.create_article(is_featured=True)
-        self._test_plugin_languages_with_article(article)
-
-
-class TestLatestArticlesPlugin(TestPluginLanguageHelperMixin,
-                               TestAppConfigPluginsBase):
-    plugin_to_test = 'NewsBlogLatestArticlesPlugin'
-    plugin_params = {
-        "latest_articles": 7,
-    }
-
-    def test_latest_articles_plugin(self):
-        articles = [self.create_article() for _ in range(7)]
-        another_app_config = NewsBlogConfig.objects.create(namespace='another')
-        another_articles = [self.create_article(app_config=another_app_config)
-                            for _ in range(3)]
-        response = self.client.get(self.plugin_page.get_absolute_url())
-        for article in articles:
-            self.assertContains(response, article.title)
-        for article in another_articles:
-            self.assertNotContains(response, article.title)
-
-    def _test_latest_articles_plugin_exclude_count(self, exclude_count=0):
-        self.plugin.exclude_featured = exclude_count
-        self.plugin.save()
-        self.plugin_page.publish(self.plugin.language)
-        articles = []
-        featured_articles = []
-        for idx in range(7):
-            if idx % 2:
-                featured_articles.append(self.create_article(is_featured=True))
-            else:
-                articles.append(self.create_article())
-        response = self.client.get(self.plugin_page.get_absolute_url())
-        for article in articles:
-            self.assertContains(response, article.title)
-        # check that configured among of featured articles is excluded
-        for featured_article in featured_articles[:exclude_count]:
-            self.assertNotContains(response, featured_article.title)
-        # ensure that other articles featured articles are present
-        for featured_article in featured_articles[exclude_count:]:
-            self.assertContains(response, featured_article.title)
-
-    def test_latest_articles_plugin_exclude_featured(self):
-        self._test_latest_articles_plugin_exclude_count(3)
-
-    def test_latest_articles_plugin_no_excluded_featured(self):
-        self._test_latest_articles_plugin_exclude_count()
-
-    def test_latest_articles_plugin_unpublished_app_page(self):
-        with override(self.language):
-            articles = [self.create_article() for _ in range(3)]
-
-        response = self.client.get(self.plugin_page.get_absolute_url())
-        for article in articles:
-            self.assertContains(response, article.title)
-
-        self.page.unpublish(self.language)
-        self.reload_urls()
-        cache.clear()
-        response = self.client.get(self.plugin_page.get_absolute_url())
-        for article in articles:
-            self.assertNotContains(response, article.title)
-
-    def test_latest_articles_plugin_language(self):
-        article = self.create_article()
-        self._test_plugin_languages_with_article(article)
-
-
-class TestPrefixedLatestArticlesPlugin(TestAppConfigPluginsBase):
-    plugin_to_test = 'NewsBlogLatestArticlesPlugin'
-    plugin_params = {
-        "latest_articles": 7,
-    }
-
-    def setUp(self):
-        super(TestPrefixedLatestArticlesPlugin, self).setUp()
-        self.app_config.template_prefix = 'dummy'
-        self.app_config.save()
-
-    def test_latest_articles_plugin(self):
-        response = self.client.get(self.plugin_page.get_absolute_url())
-        self.assertContains(response, 'This is dummy latest articles plugin')
-
-
-class TestRelatedArticlesPlugin(TestPluginLanguageHelperMixin,
-                                NewsBlogTestCase):
-
-    def test_related_articles_plugin(self):
-        main_article = self.create_article(app_config=self.app_config)
-        static_placeholder = StaticPlaceholder.objects.get_or_create(
-            code='newsblog_social',
-            site__isnull=True,
-        )[0]
-        placeholder = static_placeholder.draft
-        api.add_plugin(placeholder, 'NewsBlogRelatedPlugin', self.language)
-
-        static_placeholder.publish(None, language=self.language, force=True)
-
-        plugin = placeholder.get_plugins()[0].get_plugin_instance()[0]
-        plugin.save()
-
-        self.plugin_page.publish(self.language)
-
-        main_article.save()
-        for _ in range(3):
-            a = self.create_article()
-            a.save()
-            main_article.related.add(a)
-
-        another_language_articles = []
-        with override('de'):
-            for _ in range(4):
-                a = self.create_article()
-                main_article.related.add(a)
-                another_language_articles.append(a)
-
-        self.assertEquals(main_article.related.count(), 7)
-        unrelated = []
-        for _ in range(5):
-            unrelated.append(self.create_article())
-
-        response = self.client.get(main_article.get_absolute_url())
-        for article in main_article.related.all():
-            self.assertContains(response, article.title)
-        for article in unrelated:
-            self.assertNotContains(response, article.title)
-
-        self.page.unpublish('de')
-        self.reload_urls()
-        cache.clear()
-        response = self.client.get(main_article.get_absolute_url())
-        for article in another_language_articles:
-            self.assertNotContains(response, article.title)
-
-    def test_latest_articles_plugin_language(self):
-        main_article, related_article = [
-            self.create_article() for _ in range(2)]
-        main_article.related.add(related_article)
-        self._test_plugin_languages_with_article(related_article)
-
-
-class TestTagsPlugin(TestAppConfigPluginsBase):
-    plugin_to_test = 'NewsBlogTagsPlugin'
-
-    def test_tags_plugin(self):
-        # Published, tag1-tagged articles in our current namespace
-        self.create_tagged_articles(3, tags=['tag1'])['tag1']
-        other_articles = self.create_tagged_articles(5, tags=['tag2'])['tag2']
-        # Some tag1, but unpublished articles
-        other_articles += self.create_tagged_articles(
-            7, tags=['tag1'], is_published=False)['tag1']
-        # Some tag1 articles in another namespace
-        other_articles += self.create_tagged_articles(
-            1, tags=['tag1'], app_config=self.another_app_config)['tag1']
-
-        # REQUIRED DUE TO USE OF RAW QUERIES
-        time.sleep(1)
-
-        response = self.client.get(self.plugin_page.get_absolute_url())
-        response_content = force_text(response.content)
-        self.assertRegexpMatches(response_content, 'tag1\s*<span[^>]*>3</span>')  # noqa: #W605
-        self.assertRegexpMatches(response_content, 'tag2\s*<span[^>]*>5</span>')  # noqa: #W605
diff --git a/aldryn_newsblog/tests/test_search.py b/aldryn_newsblog/tests/test_search.py
deleted file mode 100644
index 12054931..00000000
--- a/aldryn_newsblog/tests/test_search.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# -*- coding: utf-8 -*-
-from django.utils.translation import activate
-
-from aldryn_newsblog.search_indexes import ArticleIndex
-
-from . import NewsBlogTestCase
-
-
-class ArticleIndexingTests(NewsBlogTestCase):
-
-    def get_index(self):
-        from haystack.constants import DEFAULT_ALIAS
-
-        index = ArticleIndex()
-        index._backend_alias = DEFAULT_ALIAS
-        return index
-
-    def test_article_is_indexed_using_prepare(self):
-        activate(self.language)
-
-        lead_in = 'Hello! this text will be searchable.'
-
-        article = self.create_article(lead_in=lead_in)
-        # If set ALDRYN_NEWSBLOG_UPDATE_SEARCH_DATA_ON_SAVE this will do
-        # automatically
-        article.search_data = article.get_search_data()
-
-        index = self.get_index()
-
-        data = index.prepare(article)
-
-        count = data['text'].count(lead_in)
-
-        self.assertTrue(count != 0, "Couldn't find %s in text" % lead_in)
-
-    def test_translated_article_is_indexed_using_prepare(self):
-        activate(self.language)
-
-        lead_in = 'Hello! this text will be searchable.'
-
-        # create english article
-        article = self.create_article(lead_in=lead_in)
-
-        # create german translation for article
-        article.set_current_language('de')
-        article.title = '%s [de]' % self.rand_str()
-        article.save()
-
-        index = self.get_index()
-
-        data = index.prepare(article)
-
-        self.assertEquals(data['language'], 'de')
-        self.assertEquals(data['url'], article.get_absolute_url('de'))
-
-    def test_article_not_indexed_if_no_translation(self):
-        index = self.get_index()
-        # create english article
-        article = self.create_article()
-
-        # should the index be updated for this object? (yes)
-        should_update = index.should_update(article)
-        self.assertEquals(should_update, True)
-
-        # remove all translations for article
-        article.translations.all().delete()
-
-        # should the index be updated for this object? (no)
-        should_update = index.should_update(article)
-        self.assertEquals(should_update, False)
diff --git a/aldryn_newsblog/tests/test_sitemaps.py b/aldryn_newsblog/tests/test_sitemaps.py
deleted file mode 100644
index 45c133ce..00000000
--- a/aldryn_newsblog/tests/test_sitemaps.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
-from django.contrib.sites.shortcuts import get_current_site
-from django.utils.translation import override
-
-from aldryn_newsblog.sitemaps import NewsBlogSitemap
-
-from . import NewsBlogTestCase
-
-
-class TestSitemaps(NewsBlogTestCase):
-
-    def _sitemap_urls(self, sitemap):
-        urls_info = sitemap.get_urls()
-        urls = [url_info['location'] for url_info in urls_info]
-        return urls
-
-    def _article_urls(self, articles, lang):
-        self.request = self.get_request(lang)
-        host = 'http://' + get_current_site(self.request).domain
-        return [host + article.get_absolute_url(lang) for article in articles]
-
-    def assertArticlesIn(self, articles, sitemap):
-        urls = self._sitemap_urls(sitemap)
-        article_urls = self._article_urls(articles, sitemap.language)
-
-        for url in article_urls:
-            self.assertIn(url, urls)
-
-    def assertArticlesNotIn(self, articles, sitemap):
-        urls = self._sitemap_urls(sitemap)
-        article_urls = self._article_urls(articles, sitemap.language)
-
-        for url in article_urls:
-            self.assertNotIn(url, urls)
-
-    def assertSitemapLanguage(self, sitemap, lang):
-        self.request = self.get_request(lang)
-        urls = self._sitemap_urls(sitemap)
-        host = 'http://' + get_current_site(self.request).domain
-        url_start = "{0}/{1}".format(host, lang)
-
-        for url in urls:
-            self.assertTrue(url.startswith(url_start))
-
-    def test_listening_all_instances(self):
-        articles = [self.create_article() for _ in range(11)]
-        unpublished_article = articles[0]
-        unpublished_article.is_published = False
-        unpublished_article.save()
-        sitemap = NewsBlogSitemap()
-        self.assertArticlesIn(articles[1:], sitemap)
-        self.assertArticlesNotIn([unpublished_article], sitemap)
-
-    def test_listening_namespace(self):
-        articles = [self.create_article() for _ in range(11)]
-        unpublished_article = articles[0]
-        unpublished_article.is_published = False
-        unpublished_article.save()
-        sitemap = NewsBlogSitemap(namespace=self.app_config.namespace)
-        self.assertArticlesIn(articles[1:], sitemap)
-        self.assertArticlesNotIn([unpublished_article], sitemap)
-
-    def test_listening_unexisting_namespace(self):
-        articles = [self.create_article() for _ in range(11)]
-        unpublished_article = articles[0]
-        unpublished_article.is_published = False
-        unpublished_article.save()
-        sitemap = NewsBlogSitemap(
-            namespace='not exists')
-        self.assertFalse(sitemap.items())
-        self.assertArticlesNotIn(articles, sitemap)
-
-    def test_languages_support(self):
-        with override('en'):
-            multilanguage_article = self.create_article()
-            en_article = self.create_article()
-
-        multilanguage_article.create_translation(
-            'de', title='DE title', slug='de-article')
-        with override('de'):
-            de_article = self.create_article()
-
-        en_sitemap = NewsBlogSitemap(language='en')
-        self.assertArticlesIn([multilanguage_article, en_article], en_sitemap)
-        self.assertArticlesNotIn([de_article], en_sitemap)
-        self.assertSitemapLanguage(en_sitemap, 'en')
-
-        de_sitemap = NewsBlogSitemap(language='de')
-        self.assertArticlesIn([multilanguage_article, de_article], de_sitemap)
-        self.assertArticlesNotIn([en_article], de_sitemap)
-        self.assertSitemapLanguage(de_sitemap, 'de')
diff --git a/aldryn_newsblog/tests/test_views.py b/aldryn_newsblog/tests/test_views.py
deleted file mode 100644
index bdaf81ee..00000000
--- a/aldryn_newsblog/tests/test_views.py
+++ /dev/null
@@ -1,823 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
-import os
-from datetime import date, datetime
-from operator import itemgetter
-from random import randint
-
-from django.conf import settings
-from django.core.files import File as DjangoFile
-from django.urls import NoReverseMatch, reverse
-from django.utils.timezone import now
-from django.utils.translation import override
-
-from cms.utils.i18n import force_language, get_current_language
-
-from easy_thumbnails.files import get_thumbnailer
-from filer.models.imagemodels import Image
-from parler.tests.utils import override_parler_settings
-from parler.utils.conf import add_default_language_settings
-from parler.utils.context import smart_override, switch_language
-
-from aldryn_newsblog.models import Article, NewsBlogConfig
-from aldryn_newsblog.search_indexes import ArticleIndex
-
-from . import TESTS_STATIC_ROOT, NewsBlogTestCase
-
-
-FEATURED_IMAGE_PATH = os.path.join(TESTS_STATIC_ROOT, 'featured_image.jpg')
-
-PARLER_LANGUAGES_HIDE = {
-    1: [
-        {
-            'code': u'en',
-            'fallbacks': [u'de'],
-            'hide_untranslated': True
-        },
-        {
-            'code': u'de',
-            'fallbacks': [u'en'],
-            'hide_untranslated': True
-        },
-        {
-            'code': u'fr',
-            'fallbacks': [u'en'],
-            'hide_untranslated': True
-        },
-    ],
-    'default': {
-        'hide_untranslated': True,
-        'fallbacks': [],
-    }
-}
-
-PARLER_LANGUAGES_SHOW = {
-    1: [
-        {
-            'code': u'en',
-            'fallbacks': [u'de'],
-            'hide_untranslated': False
-        },
-        {
-            'code': u'de',
-            'fallbacks': [u'en'],
-            'hide_untranslated': False
-        },
-        {
-            'code': u'fr',
-            'fallbacks': [u'en'],
-            'hide_untranslated': False
-        },
-    ],
-    'default': {
-        'hide_untranslated': False,
-        'fallbacks': [],
-    }
-}
-
-
-class TestViews(NewsBlogTestCase):
-
-    def test_articles_list(self):
-        namespace = self.app_config.namespace
-        articles = [self.create_article() for _ in range(11)]
-        unpublished_article = articles[0]
-        unpublished_article.is_published = False
-        unpublished_article.save()
-        response = self.client.get(
-            reverse('{0}:article-list'.format(namespace)))
-        for article in articles[1:]:
-            self.assertContains(response, article.title)
-        self.assertNotContains(response, unpublished_article.title)
-
-    def test_articles_list_exclude_featured(self):
-        namespace = self.app_config.namespace
-        # configure app config
-        exclude_count = 2
-        self.app_config.exclude_featured = exclude_count
-        self.app_config.paginate_by = 2
-        self.app_config.save()
-        # set up articles
-        articles = []
-        featured_articles = []
-        for idx in range(6):
-            if idx % 2:
-                featured_articles.append(self.create_article(is_featured=True))
-            else:
-                articles.append(self.create_article())
-        # imitate ordering by publish date DESC
-        articles.reverse()
-        featured_articles.reverse()
-        # prepare urls
-        list_base_url = reverse('{0}:article-list'.format(namespace))
-        page_url_template = '{0}?page={1}'
-        response_page_1 = self.client.get(list_base_url)
-        response_page_2 = self.client.get(
-            page_url_template.format(list_base_url, 2))
-
-        # page 1
-        # ensure that first two not featured articles are present on first page
-        for article in articles[:2]:
-            self.assertContains(response_page_1, article.title)
-        # Ensure no featured articles are present on first page.
-        for featured_article in featured_articles[:2]:
-            self.assertNotContains(response_page_1, featured_article.title)
-
-        # page 2
-        # check that not excluded featured article is present on second page
-        for featured_article in featured_articles[2:]:
-            self.assertContains(response_page_2, featured_article.title)
-        # ensure that third not featured article is present in the response
-        for article in articles[2:]:
-            self.assertContains(response_page_2, article.title)
-
-    def test_articles_list_pagination(self):
-        namespace = self.app_config.namespace
-        paginate_by = self.app_config.paginate_by
-        articles = [self.create_article(
-            app_config=self.app_config,
-            publishing_date=datetime(2000 - i, 1, 1, 1, 1)
-        ) for i in range(paginate_by + 5)]
-
-        response = self.client.get(
-            reverse('{0}:article-list'.format(namespace)))
-        for article in articles[:paginate_by]:
-            self.assertContains(response, article.title)
-        for article in articles[paginate_by:]:
-            self.assertNotContains(response, article.title)
-
-        response = self.client.get(
-            reverse('{0}:article-list'.format(namespace)) + '?page=2')
-        for article in articles[:paginate_by]:
-            self.assertNotContains(response, article.title)
-        for article in articles[paginate_by:]:
-            self.assertContains(response, article.title)
-
-    def test_articles_by_author(self):
-        author1, author2 = self.create_person(), self.create_person()
-        for author in (author1, author2):
-            articles = [
-                self.create_article(author=author) for _ in range(11)]
-            response = self.client.get(reverse(
-                'aldryn_newsblog:article-list-by-author',
-                kwargs={'author': author.slug}))
-            for article in articles:
-                self.assertContains(response, article.title)
-
-    def test_articles_by_unknown_author(self):
-        response = self.client.get(reverse(
-            'aldryn_newsblog:article-list-by-author',
-            kwargs={'author': 'unknown'}))
-        self.assertEqual(response.status_code, 404)
-
-    def test_articles_by_category(self):
-        """
-        Tests that we can find articles by their categories, in ANY of the
-        languages they are translated to.
-        """
-        LANGUAGES = add_default_language_settings(PARLER_LANGUAGES_HIDE)
-        with override_parler_settings(PARLER_LANGUAGES=LANGUAGES):
-            author = self.create_person()
-            for category in (self.category1, self.category2):
-                articles = []
-                code = "{0}-".format(self.language)
-                for _ in range(11):
-                    article = Article.objects.create(
-                        title=self.rand_str(),
-                        slug=self.rand_str(prefix=code),
-                        app_config=self.app_config,
-                        author=author,
-                        owner=author.user,
-                        publishing_date=now(),
-                        is_published=True,
-                    )
-                    # Make sure there are translations in place for the
-                    # articles.
-                    for language, _ in settings.LANGUAGES[1:]:
-                        with switch_language(article, language):
-                            code = "{0}-".format(language)
-                            article.title = self.rand_str(prefix=code)
-                            article.save()
-
-                    article.categories.add(category)
-                    articles.append(article)
-
-                for language, _ in settings.LANGUAGES:
-                    with switch_language(category, language):
-                        url = reverse(
-                            'aldryn_newsblog:article-list-by-category',
-                            kwargs={'category': category.slug})
-                        response = self.client.get(url)
-                    for article in articles:
-                        if language in article.get_available_languages():
-                            article.set_current_language(language)
-                            self.assertContains(response, article.title)
-                        else:
-                            article.set_current_language(language)
-                            self.assertNotContains(response, article.title)
-
-    def test_articles_by_unknown_category(self):
-        response = self.client.get(reverse(
-            'aldryn_newsblog:article-list-by-category',
-            kwargs={'category': 'unknown'}))
-        self.assertEqual(response.status_code, 404)
-
-
-class TestTemplatePrefixes(NewsBlogTestCase):
-
-    def setUp(self):
-        super(TestTemplatePrefixes, self).setUp()
-        self.app_config.template_prefix = 'dummy'
-        self.app_config.save()
-
-    def test_articles_list(self):
-        namespace = self.app_config.namespace
-        response = self.client.get(
-            reverse('{0}:article-list'.format(namespace)))
-        self.assertContains(response, 'This is dummy article list page')
-
-    def test_article_detail(self):
-        article = self.create_article(app_config=self.app_config)
-        namespace = self.app_config.namespace
-        response = self.client.get(
-            reverse(
-                '{0}:article-detail'.format(namespace),
-                kwargs={'slug': article.slug}
-            ))
-        self.assertContains(response, 'This is dummy article detail page')
-
-
-class TestTranslationFallbacks(NewsBlogTestCase):
-    def test_article_detail_not_translated_fallback(self):
-        """
-        If the fallback is configured, article is available in any
-        (configured) language
-        """
-        author = self.create_person()
-        code = "{0}-".format(self.language)
-
-        with override(settings.LANGUAGES[0][0]):
-            article = Article.objects.create(
-                title=self.rand_str(),
-                slug=self.rand_str(prefix=code),
-                app_config=self.app_config,
-                author=author, owner=author.user,
-                publishing_date=now(),
-                is_published=True,
-            )
-            article.save()
-            article.categories.add(self.category1)
-            url_one = reverse(
-                'aldryn_newsblog:article-detail',
-                kwargs={'slug': article.slug}
-            )
-        # Parler settings should be same as cms settings and vice versa
-        # ensure that if hide_untranslated = True we don't have a fallback
-        # redirect.
-        LANGUAGES = add_default_language_settings(PARLER_LANGUAGES_HIDE)
-        with override_parler_settings(PARLER_LANGUAGES=LANGUAGES):
-            language = settings.LANGUAGES[1][0]
-            with switch_language(article, language):
-                slug = article.safe_translation_getter('slug', None,
-                    language_code=language, any_language=True)
-                url = reverse(
-                    'aldryn_newsblog:article-detail',
-                    kwargs={'slug': slug}
-                )
-                self.assertNotEquals(url, url_one)
-                response = self.client.get(url)
-                self.assertEquals(response.status_code, 404)
-
-            # Test again with redirect_on_fallback = False
-            with self.settings(CMS_LANGUAGES=self.NO_REDIRECT_CMS_SETTINGS):
-                language = settings.LANGUAGES[1][0]
-                with switch_language(article, language):
-                    slug = article.safe_translation_getter('slug', None)
-                    url = reverse(
-                        'aldryn_newsblog:article-detail',
-                        kwargs={'slug': slug, }
-                    )
-                    self.assertNotEquals(url, url_one)
-                    response = self.client.get(url)
-                    self.assertEquals(response.status_code, 404)
-
-    def test_article_detail_not_translated_no_fallback(self):
-        """
-        If the fallback is disabled, article is available only in the
-        language in which is translated
-        """
-        author = self.create_person()
-        code = "{0}-".format(self.language)
-        article = Article.objects.create(
-            title=self.rand_str(), slug=self.rand_str(prefix=code),
-            app_config=self.app_config,
-            author=author, owner=author.user,
-            publishing_date=now(),
-            is_published=True,
-        )
-        article.save()
-        article.categories.add(self.category1)
-
-        PARLER_LANGUAGES = {
-            1: (
-                {'code': 'de'},
-                {'code': 'fr'},
-                {'code': 'en'},
-            ),
-            'default': {
-                'hide_untranslated': True,
-            }
-        }
-        LANGUAGES = add_default_language_settings(PARLER_LANGUAGES)
-        with override_parler_settings(PARLER_LANGUAGES=LANGUAGES):
-
-            # current language - it still exists
-            article = Article.objects.get(pk=article.pk)
-            language = settings.LANGUAGES[0][0]
-            with switch_language(self.category1, language):
-                url = reverse('aldryn_newsblog:article-detail',
-                              kwargs={'slug': article.slug})
-                response = self.client.get(url)
-                self.assertContains(response, article.title)
-
-            # non existing language - it does NOT exists
-            language = settings.LANGUAGES[1][0]
-            with switch_language(self.category1, language):
-                url = reverse('aldryn_newsblog:article-detail',
-                              kwargs={'slug': article.slug})
-                response = self.client.get(url)
-                self.assertEqual(response.status_code, 404)
-
-
-class TestImages(NewsBlogTestCase):
-    def test_article_detail_show_featured_image(self):
-        author = self.create_person()
-        with open(FEATURED_IMAGE_PATH, 'rb') as f:
-            file_obj = DjangoFile(f, name='featured_image.jpg')
-            image = Image.objects.create(owner=author.user,
-                                         original_filename='featured_image.jpg',
-                                         file=file_obj,
-                                         subject_location='fooobar')
-        article = self.create_article(author=author, featured_image=image)
-        response = self.client.get(article.get_absolute_url())
-        image_url = get_thumbnailer(article.featured_image).get_thumbnail({
-            'size': (800, 450),
-            'crop': True,
-            'subject_location': article.featured_image.subject_location
-        }).url
-        self.assertContains(response, image_url)
-
-
-class TestVariousViews(NewsBlogTestCase):
-    def test_articles_by_tag(self):
-        """
-        Tests that TagArticleList view properly filters articles by their tags.
-
-        This uses ANY of the languages articles are translated to.
-        """
-
-        untagged_articles = []
-        for _ in range(5):
-            article = self.create_article()
-            untagged_articles.append(article)
-
-        articles = self.create_tagged_articles(
-            3, tags=(self.rand_str(), self.rand_str()))
-
-        # tags are created in previous loop on demand, we need their slugs
-        tag_slug1, tag_slug2 = articles.keys()
-        url = reverse('aldryn_newsblog:article-list-by-tag',
-                      kwargs={'tag': tag_slug2})
-        response = self.client.get(url)
-        for article in articles[tag_slug2]:
-            self.assertContains(response, article.title)
-        for article in articles[tag_slug1]:
-            self.assertNotContains(response, article.title)
-        for article in untagged_articles:
-            self.assertNotContains(response, article.title)
-
-    def test_articles_by_unknown_tag(self):
-        response = self.client.get(reverse(
-            'aldryn_newsblog:article-list-by-tag',
-            kwargs={'tag': 'unknown'}))
-        self.assertEqual(response.status_code, 404)
-
-    def test_articles_count_by_month(self):
-        months = [
-            {'date': date(1914, 7, 3), 'num_articles': 1},
-            {'date': date(1914, 8, 3), 'num_articles': 3},
-            {'date': date(1945, 9, 3), 'num_articles': 5},
-        ]
-        for month in months:
-            for _ in range(month['num_articles']):
-                article = self.create_article(publishing_date=month['date'])
-
-        # unpublish one specific article to test that it is not counted
-        article.is_published = False
-        article.save()
-        months[-1]['num_articles'] -= 1
-
-        self.assertEquals(
-            sorted(
-                Article.objects.get_months(
-                    request=None, namespace=self.app_config.namespace
-                ), key=itemgetter('num_articles')), months)
-
-    def test_articles_count_by_author(self):
-        authors = []
-        for num_articles in [1, 3, 5]:
-            person = self.create_person()
-            person.num_articles = num_articles
-            authors.append((person, num_articles))
-
-        for i, data in enumerate(authors):
-            for _ in range(data[1]):
-                article = self.create_article(author=data[0])
-            # replace author with it's pk, as we need it to easily compare
-            authors[i] = (data[0].pk, data[1])
-
-        # unpublish one specific article to test that it is not counted
-        article.is_published = False
-        article.save()
-        authors[-1] = (authors[-1][0], authors[-1][1] - 1)
-
-        self.assertEquals(
-            sorted(
-                Article.objects.get_authors(
-                    namespace=self.app_config.namespace).values_list(
-                        'pk', 'num_articles'),
-                key=itemgetter(1)),
-            authors)
-
-    def test_articles_count_by_tags(self):
-        tags = Article.objects.get_tags(
-            request=None, namespace=self.app_config.namespace)
-        self.assertEquals(tags, [])
-
-        untagged_articles = []
-        for _ in range(5):
-            article = self.create_article()
-            untagged_articles.append(article)
-
-        # Tag objects are created on attaching tag name to Article,
-        # so this looks not very DRY
-        tag_names = ('tag foo', 'tag bar', 'tag buzz')
-        # create unpublished article to test that it is not counted
-        self.create_tagged_articles(
-            1, tags=(tag_names[0],), is_published=False)
-        tag_slug2 = list(self.create_tagged_articles(
-            3, tags=(tag_names[1],)).keys())[0]
-        tag_slug3 = list(self.create_tagged_articles(
-            5, tags=(tag_names[2],)).keys())[0]
-        tags_expected = [
-            (tag_slug3, 5),
-            (tag_slug2, 3),
-        ]
-        tags = Article.objects.get_tags(
-            request=None, namespace=self.app_config.namespace)
-        tags = [(tag.slug, tag.num_articles) for tag in tags]
-        self.assertEquals(tags, tags_expected)
-
-    def test_articles_by_date(self):
-        in_articles = [
-            self.create_article(
-                publishing_date=datetime(
-                    1914, 7, 28, randint(0, 23), randint(0, 59)))
-            for _ in range(11)]
-        out_articles = [
-            self.create_article(
-                publishing_date=datetime(
-                    1939, 9, 1, randint(0, 23), randint(0, 59)))
-            for _ in range(11)]
-        response = self.client.get(reverse(
-            'aldryn_newsblog:article-list-by-day',
-            kwargs={'year': '1914', 'month': '07', 'day': '28'}))
-        for article in out_articles:
-            self.assertNotContains(response, article.title)
-        for article in in_articles:
-            self.assertContains(response, article.title)
-
-    def test_articles_by_month(self):
-        in_articles = [
-            self.create_article(
-                publishing_date=datetime(
-                    1914, 7, randint(1, 31), randint(0, 23), randint(0, 59)))
-            for _ in range(11)]
-        out_articles = [
-            self.create_article(
-                publishing_date=datetime(
-                    1939, 9, 1, randint(0, 23), randint(0, 59)))
-            for _ in range(11)]
-        response = self.client.get(reverse(
-            'aldryn_newsblog:article-list-by-month',
-            kwargs={'year': '1914', 'month': '07'}))
-        for article in out_articles:
-            self.assertNotContains(response, article.title)
-        for article in in_articles:
-            self.assertContains(response, article.title)
-
-    def test_articles_by_year(self):
-        in_articles = [
-            self.create_article(
-                publishing_date=datetime(
-                    1914, randint(1, 11), randint(1, 28),
-                    randint(0, 23), randint(0, 59)))
-            for _ in range(11)]
-        out_articles = [
-            self.create_article(
-                publishing_date=datetime(
-                    1939, randint(1, 12), randint(1, 28),
-                    randint(0, 23), randint(0, 59)))
-            for _ in range(11)]
-        response = self.client.get(reverse(
-            'aldryn_newsblog:article-list-by-year', kwargs={'year': '1914'}))
-        for article in out_articles:
-            self.assertNotContains(response, article.title)
-        for article in in_articles:
-            self.assertContains(response, article.title)
-
-    def test_unattached_namespace(self):
-        # create a new namespace that has no corresponding blog app page
-        app_config = NewsBlogConfig.objects.create(namespace='another')
-        articles = [self.create_article(app_config=app_config)
-                    for _ in range(11)]
-        with self.assertRaises(NoReverseMatch):
-            self.client.get(articles[0].get_absolute_url())
-
-
-class TestIndex(NewsBlogTestCase):
-    def test_index_simple(self):
-        self.request = self.get_request('en')
-        self.index = ArticleIndex()
-        content0 = self.rand_str(prefix='content0_')
-        self.setup_categories()
-
-        article = self.create_article(content=content0, lead_in='lead in text',
-                                      title='a title')
-        article.categories.add()
-        for tag_name in ('tag 1', 'tag2'):
-            article.tags.add(tag_name)
-        for category in (self.category1, self.category2):
-            article.categories.add(category)
-        article.update_search_on_save = True
-        article.save()
-
-        self.assertEqual(self.index.get_title(article), 'a title')
-        self.assertEqual(self.index.get_description(article), 'lead in text')
-        self.assertTrue('lead in text' in self.index.get_search_data(
-            article, 'en', self.request))
-        self.assertTrue(content0 in self.index.get_search_data(
-            article, 'en', self.request))
-        self.assertTrue('tag 1' in self.index.get_search_data(
-            article, 'en', self.request))
-        self.assertTrue(self.category1.name in self.index.get_search_data(
-            article, 'en', self.request))
-
-    def test_index_multilingual(self):
-        self.index = ArticleIndex()
-        content0 = self.rand_str(prefix='content0_')
-        self.setup_categories()
-
-        article_1 = self.create_article(
-            content=content0, lead_in=u'lead in text', title=u'a title')
-        article_2 = self.create_article(
-            content=content0, lead_in=u'lead in text', title=u'second title')
-        for article in (article_1, article_2):
-            for tag_name in ('tag 1', 'tag2'):
-                article.tags.add(tag_name)
-            for category in (self.category1, self.category2):
-                article.categories.add(category)
-        with switch_language(article_2, 'de'):
-            article_2.title = u'de title'
-            article_2.lead_in = u'de lead in'
-            article_2.save()
-
-        LANGUAGES = add_default_language_settings(PARLER_LANGUAGES_HIDE)
-        with override_parler_settings(PARLER_LANGUAGES=LANGUAGES):
-            with smart_override('de'):
-                language = get_current_language()
-                # english-only article is excluded
-                qs = self.index.index_queryset(language)
-                self.assertEqual(qs.count(), 1)
-                self.assertEqual(
-                    qs.translated(language, title__icontains='title').count(),
-                    1
-                )
-                # the language is correctly setup
-                for article_de in qs:
-                    self.assertEqual(
-                        self.index.get_title(article_de), 'de title')
-                    self.assertEqual(
-                        self.index.get_description(article_de), 'de lead in')
-
-
-class ViewLanguageFallbackMixin(object):
-    view_name = None
-    view_kwargs = {}
-
-    def get_view_kwargs(self):
-        """
-        Prepare and return kwargs to resolve view
-        :return: dict
-        """
-        return {}.update(self.view_kwargs)
-
-    def create_authors(self):
-        self.author = self.create_person()
-        self.owner = self.author.user
-        return self.author, self.owner
-
-    def create_de_article(self, author=None, owner=None, app_config=None,
-                          categories=None):
-        if author is None:
-            author = self.author
-        if owner is None:
-            owner = self.owner
-        if app_config is None:
-            app_config = self.app_config
-
-        with force_language('de'):
-            de_article = Article.objects.create(
-                title='a DE title',
-                slug='a-de-title',
-                lead_in='DE lead in text',
-                author=author,
-                owner=owner,
-                app_config=app_config,
-                publishing_date=now(),
-                is_published=True,
-            )
-        if categories:
-            de_article.categories.set(categories)
-        de_article.tags.add('tag1')
-        de_article.save()
-        return de_article
-
-    def create_en_articles(self, author=None, owner=None, app_config=None,
-                           amount=3, categories=None):
-        if author is None:
-            author = self.author
-        if owner is None:
-            owner = self.owner
-        if app_config is None:
-            app_config = self.app_config
-
-        with force_language('en'):
-            articles = []
-            for _ in range(amount):
-                article = self.create_article(author=author,
-                                              owner=owner,
-                                              app_config=app_config)
-                if categories:
-                    article.categories.set(categories)
-                article.tags.add('tag1')
-                article.save()
-                articles.append(article)
-        return articles
-
-    def test_a0_en_only(self):
-        namespace = self.app_config.namespace
-        self.page.unpublish('de')
-        author, owner = self.create_authors()
-        author.translations.create(
-            slug='{0}-de'.format(author.slug),
-            language_code='de')
-        de_article = self.create_de_article(
-            author=author,
-            owner=owner,
-            categories=[self.category1],
-        )
-        articles = self.create_en_articles(categories=[self.category1])
-        with force_language('en'):
-            response = self.client.get(
-                reverse(
-                    '{0}:{1}'.format(namespace, self.view_name),
-                    kwargs=self.get_view_kwargs()
-                )
-            )
-        for article in articles:
-            self.assertContains(response, article.title)
-        self.assertNotContains(response, de_article.title)
-
-    def test_a1_en_de(self):
-        namespace = self.app_config.namespace
-        author, owner = self.create_authors()
-        author.translations.create(
-            slug='{0}-de'.format(author.slug),
-            language_code='de')
-        de_article = self.create_de_article(
-            author=author,
-            owner=owner,
-            categories=[self.category1]
-        )
-        articles = self.create_en_articles(categories=[self.category1])
-        with force_language('en'):
-            response = self.client.get(
-                reverse(
-                    '{0}:{1}'.format(namespace, self.view_name),
-                    kwargs=self.get_view_kwargs()
-                )
-            )
-        for article in articles:
-            self.assertContains(response, article.title)
-        self.assertContains(response, de_article.title)
-
-
-class ArticleListViewLanguageFallback(ViewLanguageFallbackMixin,
-                                      NewsBlogTestCase):
-    view_name = 'article-list'
-
-
-class LatestArticlesFeedLanguageFallback(ViewLanguageFallbackMixin,
-                                         NewsBlogTestCase):
-    view_name = 'article-list-feed'
-
-
-class YearArticleListLanguageFallback(ViewLanguageFallbackMixin,
-                                      NewsBlogTestCase):
-    view_name = 'article-list-by-year'
-
-    def get_view_kwargs(self):
-        return {'year': now().year}
-
-
-class MonthArticleListLanguageFallback(ViewLanguageFallbackMixin,
-                                       NewsBlogTestCase):
-    view_name = 'article-list-by-month'
-
-    def get_view_kwargs(self):
-        kwargs = {
-            'year': now().year,
-            'month': now().month,
-        }
-        return kwargs
-
-
-class DayArticleListLanguageFallback(ViewLanguageFallbackMixin,
-                                     NewsBlogTestCase):
-    view_name = 'article-list-by-day'
-
-    def get_view_kwargs(self):
-        kwargs = {
-            'year': now().year,
-            'month': now().month,
-            'day': now().day,
-        }
-        return kwargs
-
-
-# class AuthorArticleListLanguageFallback(ViewLanguageFallbackMixin,
-#                                         NewsBlogTestCase):
-#     view_name = 'article-list-by-author'
-#
-#     def get_view_kwargs(self):
-#         kwargs = {
-#             'author': self.author.slug
-#         }
-#         return kwargs
-
-
-class CategoryArticleListLanguageFallback(ViewLanguageFallbackMixin,
-                                          NewsBlogTestCase):
-    view_name = 'article-list-by-category'
-
-    def get_view_kwargs(self):
-        kwargs = {
-            'category': self.category1.slug
-        }
-        return kwargs
-
-
-class CategoryFeedListLanguageFallback(ViewLanguageFallbackMixin,
-                                       NewsBlogTestCase):
-    view_name = 'article-list-by-category-feed'
-
-    def get_view_kwargs(self):
-        kwargs = {
-            'category': self.category1.slug
-        }
-        return kwargs
-
-
-class TagArticleListLanguageFallback(ViewLanguageFallbackMixin,
-                                     NewsBlogTestCase):
-    view_name = 'article-list-by-tag'
-
-    def get_view_kwargs(self):
-        kwargs = {
-            'tag': 'tag1'
-        }
-        return kwargs
-
-
-class TagFeedLanguageFallback(ViewLanguageFallbackMixin,
-                              NewsBlogTestCase):
-    view_name = 'article-list-by-tag-feed'
-
-    def get_view_kwargs(self):
-        kwargs = {
-            'tag': 'tag1'
-        }
-        return kwargs
diff --git a/aldryn_people/tests/__init__.py b/aldryn_people/tests/__init__.py
deleted file mode 100644
index 76ed02a8..00000000
--- a/aldryn_people/tests/__init__.py
+++ /dev/null
@@ -1,301 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
-import sys
-
-from django.conf import settings
-from django.contrib.auth.hashers import make_password
-from django.contrib.auth.models import User
-from django.contrib.sites.models import Site
-from django.db import IntegrityError
-from django.test import RequestFactory, TestCase
-from django.urls import clear_url_caches
-from django.utils.translation import override
-
-from cms import api
-from cms.apphook_pool import apphook_pool
-from cms.appresolver import clear_app_resolvers
-from cms.exceptions import AppAlreadyRegistered
-from cms.models import Page, Title
-from cms.test_utils.testcases import BaseCMSTestCase
-from cms.utils.conf import get_cms_setting
-from cms.utils.i18n import force_language, get_language_list
-
-from djangocms_helper.utils import create_user
-
-from ..models import Group, Person
-
-
-APP_MODULE = 'aldryn_people.cms_apps'
-DEFAULT_PEOPLE_NAMESPACE = 'aldryn_people'
-
-
-class CleanUpMixin(object):
-
-    def tearDown(self):
-        self.reset_all()
-        super(CleanUpMixin, self).tearDown()
-
-    def reset_all(self):
-        """
-        Reset all that could leak from previous test to current/next test.
-        :return: None
-        """
-        self.delete_app_module()
-        self.reload_urls()
-        self.apphook_clear()
-
-    def delete_app_module(self):
-        """
-        Remove APP_MODULE from sys.modules. Taken from cms.
-        :return: None
-        """
-        if APP_MODULE in sys.modules:
-            del sys.modules[APP_MODULE]
-
-    def apphook_clear(self):
-        """
-        Clean up apphook_pool and sys.modules. Taken from cms with slight
-        adjustments and fixes.
-        :return: None
-        """
-        try:
-            apphooks = apphook_pool.get_apphooks()
-        except AppAlreadyRegistered:
-            # there is an issue with discover apps, or i'm using it wrong.
-            # setting discovered to True solves it. Maybe that is due to import
-            # from aldryn_events.cms_apps which registers EventListAppHook
-            apphook_pool.discovered = True
-            apphooks = apphook_pool.get_apphooks()
-
-        for name, label in list(apphooks):
-            if apphook_pool.apps[name].__class__.__module__ in sys.modules:
-                del sys.modules[apphook_pool.apps[name].__class__.__module__]
-        apphook_pool.clear()
-
-    def reload_urls(self):
-        """
-        Clean up url related things (caches, app resolvers, modules).
-        Taken from cms.
-        :return: None
-        """
-        clear_app_resolvers()
-        clear_url_caches()
-        url_modules = [
-            'cms.urls',
-            'aldryn_events.urls',
-            settings.ROOT_URLCONF
-        ]
-
-        for module in url_modules:
-            if module in sys.modules:
-                del sys.modules[module]
-
-
-class DefaultApphookMixin(object):
-    """
-    Creates the default app hook page for aldryn-people. Relyes on
-    BasePeopleTest.setUp method and its utilities.
-    """
-
-    def setUp(self):
-        super(DefaultApphookMixin, self).setUp()
-        self.app_hook_page = self.create_apphook_page(multilang=True)
-
-
-class DefaultSetupMixin(object):
-    su_username = 'user'
-    su_password = 'pass'
-
-    data = {
-        'group1': {
-            'en': {'name': 'group1', 'description': 'description1'},
-            'de': {'name': 'Gruppe1', 'description': 'Beschreibung1'},
-        },
-        'group2': {
-            # This should *not* have a EN translation
-            'de': {'name': 'Gruppe2', 'description': 'Beschreibung2'},
-        },
-        'person1': {
-            'en': {'name': 'person1', 'slug': 'person1',
-                   'function': 'function1', 'description': 'description-en'},
-            'de': {'name': 'mensch1', 'slug': 'mensch1',
-                   'function': 'Funktion1', 'description': 'Beschreibung-de'},
-        },
-        'person2': {
-            # This should *not* have a EN translation
-            'de': {'name': 'mensch2', 'slug': 'mensch2',
-                   'function': 'Funktion2', 'description': 'Beschreibung2'},
-        },
-    }
-
-    def setUp(self):
-        self.template = get_cms_setting('TEMPLATES')[0][0]
-        self.language = settings.LANGUAGES[0][0]
-        self.page = api.create_page(
-            'page', self.template, self.language, published=True)
-        api.create_title('de', 'page de', self.page)
-        self.page.publish('de')
-        self.placeholder = self.page.placeholders.all()[0]
-        self.superuser = self.create_superuser()
-        super(DefaultSetupMixin, self).setUp()
-
-    def create_superuser(self):
-        return User.objects.create_superuser(
-            self.su_username, 'email@example.com', self.su_password)
-
-    def create_user(self, user_name, user_password, is_staff=False,
-                    is_superuser=False):
-        return User.objects.create(
-            username=user_name,
-            first_name='{0} first_name'.format(user_name),
-            last_name='{0} last_name'.format(user_name),
-            password=make_password(user_password),
-            is_staff=is_staff,
-            is_superuser=is_superuser
-        )
-
-    def create_apphook_page(self, multilang=False):
-        with force_language('en'):
-            page = api.create_page(
-                title='People en', template=self.template, language='en',
-                published=True,
-                parent=self.page,
-                apphook='PeopleApp',
-                apphook_namespace=DEFAULT_PEOPLE_NAMESPACE,
-            )
-        page.publish('en')
-        if multilang:
-            api.create_title('de', 'People de', page)
-            page.publish('de')
-        return page.reload()
-
-
-class BasePeopleTest(DefaultSetupMixin,
-                     CleanUpMixin,
-                     BaseCMSTestCase,
-                     TestCase):
-
-    @staticmethod
-    def reload(obj, language=None):
-        """Simple convenience method for re-fetching an object from the ORM,
-        optionally "as" a specified language."""
-        try:
-            new_obj = obj.__class__.objects.language(language).get(id=obj.id)
-        except obj.__class__.DoesNotExist:
-            new_obj = obj.__class__.objects.get(id=obj.id)
-        return new_obj
-
-    def assertEqualItems(self, a, b):
-        try:
-            # In Python3, this method has been renamed (poorly)
-            return self.assertCountEqual(a, b)
-        except AttributeError:
-            return self.assertItemsEqual(a, b)
-
-    def mktranslation(self, obj, lang, **kwargs):
-        """Simple method of adding a translation to an existing object."""
-        try:
-            obj.set_current_language(lang)
-        except:  # noqa: This is a 3rd-party app, so we don't know for sure which kinds of errors may be raised here
-            try:
-                obj.translate(lang)
-            except IntegrityError:
-                pass
-        for k, v in kwargs.items():
-            setattr(obj, k, v)
-        obj.save()
-
-    def setUp(self):
-        super(BasePeopleTest, self).setUp()
-        with override('en'):
-            self.person1 = Person(**self.data['person1']['en'])
-            self.group1 = Group(**self.data['group1']['en'])
-        self.person1.name = 'person1'
-        self.person1.slug = 'person1-slug'
-        self.person1.save()
-        self.group1.save()
-
-        # Add a DE translation for person1, group1
-        self.mktranslation(self.person1, 'de', **self.data['person1']['de'])
-        self.mktranslation(self.group1, 'de', **self.data['group1']['de'])
-
-        # Make person2, group2
-        with override('de'):
-            self.person2 = Person(**self.data['person2']['de'])
-            self.group2 = Group(**self.data['group2']['de'])
-        self.person2.save()
-        self.group2.save()
-
-        self.reset_all()
-
-    def set_defalut_person_objects_current_language(self, language):
-        """
-        Make sure parler active language is set to language.
-        :param language: language_code
-        :return: None
-        """
-        self.person1.set_current_language(language)
-        self.person2.set_current_language(language)
-
-
-class CMSRequestBasedTest(CleanUpMixin, TestCase):
-    """Sets-up User(s) and CMS Pages for testing."""
-    languages = get_language_list()
-
-    @classmethod
-    def setUpClass(cls):
-        cls.request_factory = RequestFactory()
-        cls.user = create_user('normal', 'normal@admin.com', 'normal')
-        cls.site1 = Site.objects.get(pk=1)
-
-    @classmethod
-    def tearDownClass(cls):
-        User.objects.all().delete()
-
-    def get_or_create_page(self, base_title=None, languages=None):
-        """Creates a page with a given title, or, if it already exists, just
-        retrieves and returns it."""
-        from cms.api import create_page, create_title
-        if not base_title:
-            # No title? Create one.
-            base_title = self.rand_str(prefix="page", length=8)
-        if not languages:
-            # If no langs supplied, use'em all
-            languages = self.languages
-        # If there is already a page with this title, just return it.
-        try:
-            page_title = Title.objects.get(title=base_title)
-            return page_title.page.get_draft_object()
-        except (Title.DoesNotExist, Page.DoesNotExist):
-            pass
-
-        # No? Okay, create one.
-        page = create_page(base_title, 'fullwidth.html', language=languages[0])
-        # If there are multiple languages, create the translations
-        if len(languages) > 1:
-            for lang in languages[1:]:
-                title_lang = "{0}-{1}".format(base_title, lang)
-                create_title(language=lang, title=title_lang, page=page)
-                page.publish(lang)
-        return page.get_draft_object()
-
-    def get_page_request(
-            self, page, user, path=None, edit=False, lang_code='en'):
-        from cms.middleware.toolbar import ToolbarMiddleware
-        path = path or page and page.get_absolute_url()
-        if edit:
-            path += '?edit'
-        request = RequestFactory().get(path)
-        request.session = {}
-        request.user = user
-        request.LANGUAGE_CODE = lang_code
-        if edit:
-            request.GET = {'edit': None}
-        else:
-            request.GET = {'edit_off': None}
-        request.current_page = page
-        mid = ToolbarMiddleware()
-        mid.process_request(request)
-        return request
diff --git a/aldryn_people/tests/frontend/.eslintrc.js b/aldryn_people/tests/frontend/.eslintrc.js
deleted file mode 100644
index ab82b252..00000000
--- a/aldryn_people/tests/frontend/.eslintrc.js
+++ /dev/null
@@ -1,30 +0,0 @@
-module.exports = {
-    "env": {
-        "node": true
-    },
-    "globals": {
-        "$": true,
-        "module": true,
-        "process": true,
-        "it": true,
-        "CMS": true,
-        "expect": true,
-        "jasmine": true,
-        "describe": true,
-        "casper": true,
-        "beforeEach": true,
-        "afterEach": true,
-        "beforeAll": true,
-        "afterAll": true,
-        "spyOn": true,
-        "spyOnEvent": true,
-        "fixture": true,
-        "pending": true
-    },
-    "rules": {
-        "no-magic-numbers": 0,
-        "max-nested-callbacks": [2, 8],
-        "newline-after-var": 0,
-        "strict": [2, "global"]
-    }
-};
diff --git a/aldryn_people/tests/frontend/casperjs.conf.js b/aldryn_people/tests/frontend/casperjs.conf.js
deleted file mode 100644
index 2e7bdd9b..00000000
--- a/aldryn_people/tests/frontend/casperjs.conf.js
+++ /dev/null
@@ -1,27 +0,0 @@
-'use strict';
-
-// #############################################################################
-// CasperJS options
-
-module.exports = {
-    init: function () {
-        this.viewportSize();
-        this.timeout(20000);
-    },
-
-    viewportSize: function (width, height) {
-        var viewportWidth = width || 1280;
-        var viewportHeight = height || 1024;
-
-        casper.echo('Current viewport size is ' + viewportWidth + 'x' + viewportHeight + '.', 'INFO');
-
-        casper.options.viewportSize = {
-            width: viewportWidth,
-            height: viewportHeight
-        };
-    },
-
-    timeout: function (timeout) {
-        casper.options.waitTimeout = timeout || 10000;
-    }
-};
diff --git a/aldryn_people/tests/frontend/fixtures/people.html b/aldryn_people/tests/frontend/fixtures/people.html
deleted file mode 100644
index d9238de5..00000000
--- a/aldryn_people/tests/frontend/fixtures/people.html
+++ /dev/null
@@ -1 +0,0 @@
-<div class="plugin-people"></div>
diff --git a/aldryn_people/tests/frontend/integration/crud.js b/aldryn_people/tests/frontend/integration/crud.js
deleted file mode 100644
index 2eae53c5..00000000
--- a/aldryn_people/tests/frontend/integration/crud.js
+++ /dev/null
@@ -1,189 +0,0 @@
-'use strict';
-
-var helpers = require('djangocms-casper-helpers');
-var globals = helpers.settings;
-var casperjs = require('casper');
-var cms = helpers(casperjs);
-var xPath = casperjs.selectXPath;
-
-casper.test.setUp(function (done) {
-    casper.start()
-        .then(cms.login())
-        .run(done);
-});
-
-casper.test.tearDown(function (done) {
-    casper.start()
-        .then(cms.logout())
-        .run(done);
-});
-
-casper.test.begin('Creation of a new group', function (test) {
-    casper
-        .start(globals.adminUrl)
-        .waitUntilVisible('#content', function () {
-            test.assertVisible('#content', 'Admin loaded');
-            this.click(
-                xPath(cms.getXPathForAdminSection({
-                    section: 'Aldryn_People',
-                    row: 'Groups',
-                    link: 'Add'
-                }))
-            );
-        })
-        .waitForUrl(/add/)
-        .waitUntilVisible('#group_form')
-        .then(function () {
-            test.assertVisible('#group_form', 'Group creation form has been loaded');
-
-            this.fill('#group_form', {
-                name: 'Test group'
-            }, true);
-        })
-        .waitUntilVisible('.success', function () {
-            test.assertSelectorHasText(
-                '.success',
-                'The Group "Test group" was added successfully.',
-                'New group has been created'
-            );
-        })
-        .run(function () {
-            test.done();
-        });
-});
-
-casper.test.begin('Creation of a new people entry', function (test) {
-    casper
-        .start(globals.adminUrl)
-        .waitUntilVisible('#content', function () {
-            this.click(
-                xPath(cms.getXPathForAdminSection({
-                    section: 'Aldryn_People',
-                    row: 'People',
-                    link: 'Add'
-                }))
-            );
-        })
-        .waitForUrl(/add/)
-        .waitUntilVisible('#person_form')
-        .then(function () {
-            test.assertVisible('#person_form', 'People creation form has been loaded');
-
-            this.fill('#person_form', {
-                name: 'Test person'
-            }, true);
-        })
-        .waitUntilVisible('.success', function () {
-            test.assertSelectorHasText(
-                '.success',
-                'The Person "Test person" was added successfully.',
-                'New person has been created'
-            );
-        })
-        .run(function () {
-            test.done();
-        });
-});
-
-casper.test.begin('Adding a new people block to the page', function (test) {
-    casper
-        .start()
-        .then(cms.addPage({ title: 'People' }))
-        .then(cms.addPlugin({
-            type: 'PeoplePlugin'
-        }))
-        .thenOpen(globals.editUrl, function () {
-            test.assertTitleMatch(/People/, 'The People page has been created');
-        })
-        .then(cms.publishPage({ page: 'People' }))
-        .thenOpen(globals.editUrl, function () {
-            test.assertSelectorHasText(
-                '.cms-plugin h2',
-                'Test person',
-                'The newly created "Test person" is displayed on the "People" page'
-            );
-        })
-        .run(function () {
-            test.done();
-        });
-});
-
-casper.test.begin('Deletion of a group', function (test) {
-    casper
-        .start(globals.adminUrl)
-        .waitUntilVisible('#content', function () {
-            this.click(
-                xPath(cms.getXPathForAdminSection({
-                    section: 'Aldryn_People',
-                    row: 'Groups',
-                    link: 'Change'
-                }))
-            );
-        })
-        .waitForUrl(/group/)
-        .waitUntilVisible('#result_list', function () {
-            test.assertElementCount(
-                '#result_list tbody tr',
-                1,
-                'The group is available'
-            );
-
-            this.clickLabel('Test group', 'a');
-        })
-        .waitUntilVisible('.deletelink', function () {
-            this.click('.deletelink');
-        })
-        .waitForUrl(/delete/, function () {
-            this.click('input[value="Yes, I\'m sure"]');
-        })
-        .waitUntilVisible('.success', function () {
-            test.assertSelectorHasText(
-                '.success',
-                'The Group "Test group" was deleted successfully.',
-                'The group has been deleted'
-            );
-        })
-        .run(function () {
-            test.done();
-        });
-});
-
-casper.test.begin('Deletion of a people entry', function (test) {
-    casper
-        .start(globals.adminUrl)
-        .waitUntilVisible('#content', function () {
-            this.click(
-                xPath(cms.getXPathForAdminSection({
-                    section: 'Aldryn_People',
-                    row: 'People',
-                    link: 'Change'
-                }))
-            );
-        })
-        .waitForUrl(/person/)
-        .waitUntilVisible('#result_list', function () {
-            test.assertElementCount(
-                '#result_list tbody tr',
-                1,
-                'The people entry is available'
-            );
-
-            this.clickLabel('Test person', 'a');
-        })
-        .waitUntilVisible('.deletelink', function () {
-            this.click('.deletelink');
-        })
-        .waitForUrl(/delete/, function () {
-            this.click('input[value="Yes, I\'m sure"]');
-        })
-        .waitUntilVisible('.success', function () {
-            test.assertSelectorHasText(
-                '.success',
-                'The Person "Test person" was deleted successfully.',
-                'The person has been deleted'
-            );
-        })
-        .run(function () {
-            test.done();
-        });
-});
diff --git a/aldryn_people/tests/frontend/integration/handlers/externalMissing.js b/aldryn_people/tests/frontend/integration/handlers/externalMissing.js
deleted file mode 100644
index 4962b9e6..00000000
--- a/aldryn_people/tests/frontend/integration/handlers/externalMissing.js
+++ /dev/null
@@ -1,12 +0,0 @@
-'use strict';
-
-// #############################################################################
-// Handles external resources load failures
-
-module.exports = {
-    bind: function () {
-        casper.on('resource.error', function (resource) {
-            casper.echo('Resource failed to load: ' + resource.url, 'ERROR');
-        });
-    }
-};
diff --git a/aldryn_people/tests/frontend/integration/handlers/loadFailures.js b/aldryn_people/tests/frontend/integration/handlers/loadFailures.js
deleted file mode 100644
index 9a66119c..00000000
--- a/aldryn_people/tests/frontend/integration/handlers/loadFailures.js
+++ /dev/null
@@ -1,12 +0,0 @@
-'use strict';
-
-// #############################################################################
-// Handles load failure errors
-
-module.exports = {
-    bind: function () {
-        casper.on('load.failed', function (error) {
-            casper.echo(JSON.stringify(error), 'ERROR');
-        });
-    }
-};
diff --git a/aldryn_people/tests/frontend/integration/handlers/missingPages.js b/aldryn_people/tests/frontend/integration/handlers/missingPages.js
deleted file mode 100644
index ff6d5351..00000000
--- a/aldryn_people/tests/frontend/integration/handlers/missingPages.js
+++ /dev/null
@@ -1,16 +0,0 @@
-'use strict';
-
-// #############################################################################
-// Handles 404 and 500 pages
-
-module.exports = {
-    bind: function () {
-        casper.on('http.status.404', function (resource) {
-            casper.echo('404 page found: ' + resource.url, 'ERROR');
-        });
-
-        casper.on('http.status.500', function (resource) {
-            casper.echo('500 page found: ' + resource.url, 'ERROR');
-        });
-    }
-};
diff --git a/aldryn_people/tests/frontend/integration/handlers/pageErrors.js b/aldryn_people/tests/frontend/integration/handlers/pageErrors.js
deleted file mode 100644
index 77ab8860..00000000
--- a/aldryn_people/tests/frontend/integration/handlers/pageErrors.js
+++ /dev/null
@@ -1,12 +0,0 @@
-'use strict';
-
-// #############################################################################
-// Handles JavaScript page errors
-
-module.exports = {
-    bind: function () {
-        casper.on('page.error', function (msg) {
-            casper.echo('Error on page: ' + JSON.stringify(msg), 'ERROR');
-        });
-    }
-};
diff --git a/aldryn_people/tests/frontend/integration/handlers/suiteFailures.js b/aldryn_people/tests/frontend/integration/handlers/suiteFailures.js
deleted file mode 100644
index 98f019e9..00000000
--- a/aldryn_people/tests/frontend/integration/handlers/suiteFailures.js
+++ /dev/null
@@ -1,22 +0,0 @@
-'use strict';
-
-// #############################################################################
-// Handles test suite errors (assert and waitFor)
-
-module.exports = {
-    bind: function () {
-        casper.on('step.error', function (error) {
-            casper.die('assert failed: ' + error.message);
-        });
-
-        casper.on('waitFor.timeout', function (timeout, error) {
-            if (error.selector) {
-                casper.die('waitFor failed, couldn\'t find ' + error.selector + ' within ' + timeout + 'ms');
-            } else if (error.visible) {
-                casper.die('waitFor failed, couldn\'t find ' + error.visible + ' within ' + timeout + 'ms');
-            } else {
-                casper.die('waitFor failed with error', JSON.stringify(error, null, 4));
-            }
-        });
-    }
-};
diff --git a/aldryn_people/tests/frontend/integration/setup.js b/aldryn_people/tests/frontend/integration/setup.js
deleted file mode 100644
index 93f356b1..00000000
--- a/aldryn_people/tests/frontend/integration/setup.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// #############################################################################
-// Init all settings and event handlers on suite start
-'use strict';
-
-require('./../casperjs.conf').init();
-
-require('./handlers/pageErrors').bind();
-require('./handlers/loadFailures').bind();
-require('./handlers/missingPages').bind();
-require('./handlers/externalMissing').bind();
-require('./handlers/suiteFailures').bind();
-
-casper.test.done();
diff --git a/aldryn_people/tests/frontend/karma.conf.js b/aldryn_people/tests/frontend/karma.conf.js
deleted file mode 100644
index 348cc51b..00000000
--- a/aldryn_people/tests/frontend/karma.conf.js
+++ /dev/null
@@ -1,95 +0,0 @@
-/*!
- * @author:    Divio AG
- * @copyright: http://www.divio.ch
- */
-
-'use strict';
-
-// #############################################################################
-// CONFIGURATION
-module.exports = function (config) {
-    var browsers = {
-        PhantomJS: 'used for local testing'
-    };
-
-    var settings = {
-        // base path that will be used to resolve all patterns (eg. files, exclude)
-        basePath: '..',
-
-        // frameworks to use
-        // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
-        frameworks: ['jasmine', 'fixture'],
-
-        // list of files / patterns to load in the browser
-        // tests/${path}
-        files: [
-            // these have to be specified in order since
-            // dependency loading is not handled yet
-            '../../aldryn_people/boilerplates/bootstrap3/static/js/libs/*.js',
-            '../../aldryn_people/boilerplates/bootstrap3/static/js/addons/*.js',
-
-            // tests themselves
-            'frontend/unit/*.js',
-
-            // fixture patterns
-            {
-                pattern: 'frontend/fixtures/**/*'
-            }
-        ],
-
-        // list of files to exclude
-        exclude: [],
-
-        // preprocess matching files before serving them to the browser
-        // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
-        preprocessors: {
-            '../../aldryn_people/boilerplates/bootstrap3/static/js/addons/*.js': ['coverage'],
-            // for fixtures
-            '**/*.html': ['html2js'],
-            '**/*.json': ['json_fixtures']
-        },
-
-        // optionally, configure the reporter
-        coverageReporter: {
-            reporters: [
-                { type: 'html', dir: 'frontend/coverage/' },
-                { type: 'lcov', dir: 'frontend/coverage/' }
-            ]
-        },
-
-        // fixtures dependency
-        // https://github.com/billtrik/karma-fixture
-        jsonFixturesPreprocessor: {
-            variableName: '__json__'
-        },
-
-        // test results reporter to use
-        // possible values: 'dots', 'progress'
-        // available reporters: https://npmjs.org/browse/keyword/karma-reporter
-        reporters: ['progress', 'coverage'],
-
-        // web server port
-        port: 9876,
-
-        // enable / disable colors in the output (reporters and logs)
-        colors: true,
-
-        // level of logging
-        // possible values:
-        // config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
-        logLevel: config.LOG_INFO,
-
-        // enable / disable watching file and executing tests whenever any file changes
-        autoWatch: true,
-
-        // start these browsers
-        // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-        browsers: Object.keys(browsers),
-
-        // Continuous Integration mode
-        // if true, Karma captures browsers, runs the tests and exits
-        singleRun: false
-    };
-
-    config.set(settings);
-};
diff --git a/aldryn_people/tests/frontend/unit/test.cl.people.js b/aldryn_people/tests/frontend/unit/test.cl.people.js
deleted file mode 100644
index 8977d9e7..00000000
--- a/aldryn_people/tests/frontend/unit/test.cl.people.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/*!
- * @author:    Divio AG
- * @copyright: http://www.divio.ch
- */
-
-'use strict';
-/* global describe, it, expect, beforeEach, afterEach, fixture */
-
-// #############################################################################
-// UNIT TEST
-describe('cl.people.js:', function () {
-    beforeEach(function () {
-        fixture.setBase('frontend/fixtures');
-        this.markup = fixture.load('people.html');
-        this.preventEvent = { preventDefault: function () {} };
-    });
-
-    afterEach(function () {
-        fixture.cleanup();
-    });
-
-    it('runs dummy test', function () {
-        expect('dummy test').toEqual('dummy test');
-    });
-
-});
diff --git a/aldryn_people/tests/test_admin.py b/aldryn_people/tests/test_admin.py
deleted file mode 100644
index b0a5b105..00000000
--- a/aldryn_people/tests/test_admin.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
-from django.contrib import admin
-
-from cms.utils.urlutils import admin_reverse
-
-from . import BasePeopleTest
-from ..admin import PersonAdmin
-
-
-class TestPersonAdmin(BasePeopleTest):
-
-    def test_all_translations(self):
-        # Check that all the available languages appear in `all_translations`
-        model_admin = PersonAdmin(self.person1, admin.site)
-        all_translations = model_admin.all_translations(self.person1)
-        obj_id = self.person1.id
-
-        change_url = admin_reverse('aldryn_people_person_change', args=[obj_id])
-
-        self.assertTrue(change_url + '?language=en' in all_translations)
-        self.assertTrue(change_url + '?language=de' in all_translations)
-        self.assertTrue(change_url + '?language=fr' in all_translations)
diff --git a/aldryn_people/tests/test_app_hook.py b/aldryn_people/tests/test_app_hook.py
deleted file mode 100644
index 9446c55e..00000000
--- a/aldryn_people/tests/test_app_hook.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
-from django.urls import reverse
-
-from . import BasePeopleTest
-from ..models import Person
-
-
-class TestPersonAppHook(BasePeopleTest):
-
-    def test_add_people_app(self):
-        """
-        We add a person to the app
-        """
-        self.page.application_urls = 'PeopleApp'
-        self.page.application_namespace = 'aldryn_people'
-        self.page.save()
-        self.page.publish(self.language)
-
-        person = Person.objects.create(
-            name='Michael', phone='0785214521', email='michael@mit.ch',
-            slug='michael'
-        )
-        # By slug
-        url = reverse('aldryn_people:person-detail', kwargs={'slug': person.slug})
-        response = self.client.get(url)
-        self.assertContains(response, 'Michael')
-
-        # By pk
-        url = reverse('aldryn_people:person-detail', kwargs={'pk': person.pk})
-        response = self.client.get(url)
-        self.assertContains(response, 'Michael')
diff --git a/aldryn_people/tests/test_migrations.py b/aldryn_people/tests/test_migrations.py
deleted file mode 100644
index 2b69e62f..00000000
--- a/aldryn_people/tests/test_migrations.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-# original from
-# http://tech.octopus.energy/news/2016/01/21/testing-for-missing-migrations-in-django.html
-from django.core.management import call_command
-from django.test import TestCase, override_settings
-from six import text_type
-from six.moves import StringIO
-
-
-class MigrationTestCase(TestCase):
-
-    @override_settings(MIGRATION_MODULES={})
-    def test_for_missing_migrations(self):
-        output = StringIO()
-        options = {
-            'interactive': False,
-            'dry_run': True,
-            'stdout': output,
-            'check_changes': True,
-        }
-
-        try:
-            call_command('makemigrations', **options)
-        except SystemExit as e:
-            status_code = text_type(e)
-        else:
-            # the "no changes" exit code is 0
-            status_code = '0'
-
-        if status_code == '1':
-            self.fail('There are missing migrations:\n {}'.format(output.getvalue()))
diff --git a/aldryn_people/tests/test_models.py b/aldryn_people/tests/test_models.py
deleted file mode 100644
index 060b1353..00000000
--- a/aldryn_people/tests/test_models.py
+++ /dev/null
@@ -1,249 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.test import TransactionTestCase
-from django.utils.encoding import force_text
-from django.utils.translation import override
-
-from . import BasePeopleTest, DefaultApphookMixin
-from ..models import Group, Person
-
-
-class TestBasicPeopleModels(DefaultApphookMixin, BasePeopleTest):
-
-    def test_create_person(self):
-        """We can create a person with a name."""
-        name = 'Tom Test'
-        person = Person.objects.create(name=name)
-        person.refresh_from_db()
-        self.assertEqual(person.name, name)
-
-    def test_delete_person(self):
-        """We can delete a person."""
-        name = 'Person Delete'
-        person = Person.objects.create(name=name)
-        Person.objects.get(pk=person.pk).delete()
-        self.assertFalse(Person.objects.filter(pk=person.pk))
-
-    def test_str(self):
-        name = 'Person Str'
-        person = Person.objects.create(name=name)
-        self.assertEqual(force_text(person), name)
-
-    def test_absolute_url(self):
-        slug = 'person-slug'
-        person = Person.objects.create(slug=slug)
-        # This isn't a translation test, per se, but let's make sure that we
-        # have a predictable language prefix, regardless of the tester's locale.
-        with override('en'):
-            app_hook_url = self.app_hook_page.get_absolute_url()
-            self.assertEqual(
-                person.get_absolute_url(),
-                '{0}{1}/'.format(app_hook_url, slug)
-            )
-            # Now test that it will work when there's no slug too.
-            person.slug = ''
-            self.assertEqual(
-                person.get_absolute_url(),
-                '{0}{1}/'.format(app_hook_url, person.pk),
-            )
-
-    def test_auto_slugify(self):
-        name = 'Melchior Hoffman'
-        slug = 'melchior-hoffman'
-        person = Person.objects.create(name=name)
-        person.save()
-        self.assertEquals(person.slug, slug)
-
-    def test_auto_slugify_same_name(self):
-        name_1 = 'Melchior Hoffman'
-        slug_1 = 'melchior-hoffman'
-        person_1 = Person.objects.create(name=name_1)
-        person_1.save()
-
-        name_2 = 'Melchior Hoffman'
-        slug_2 = 'melchior-hoffman-1'
-        person_2 = Person.objects.create(name=name_2)
-        person_2.save()
-
-        self.assertEquals(person_1.slug, slug_1)
-        self.assertEquals(person_2.slug, slug_2)
-
-
-class TestBasicGroupModel(TransactionTestCase):
-
-    def test_create_group(self):
-        """We can create a group with a name."""
-        group = Group.objects.create(name='group_b')
-        self.assertTrue(group.name, 'group_b')
-
-    def test_delete_group(self):
-        """We can delete a group."""
-        name = 'Group Delete'
-        Group.objects.create(name=name)
-        group = Group.objects.translated(name=name)
-        if group:
-            group[0].delete()
-        self.assertFalse(Group.objects.translated(name=name))
-
-    def test_create_another_group(self):
-        """we create a group."""
-        name = 'Gruppe Neu'
-        group = Group.objects.create(name=name)
-        self.assertEqual(group.name, name)
-        self.assertEqual(Group.objects.all()[0], group)
-
-    def test_add_person_to_group(self):
-        """We create a person and add her to the created group."""
-        personname = 'Daniel'
-        person = Person.objects.create(name=personname)
-        name = 'Group One'
-        group = Group.objects.create(name=name)
-        person.groups.add(group)
-        person.save()
-        self.assertIn(person, group.people.all())
-
-
-class TestPersonModelTranslation(BasePeopleTest):
-
-    def test_person_translatable(self):
-        person1 = self.reload(self.person1, 'en')
-        self.assertEqual(
-            person1.function,
-            self.data['person1']['en']['function']
-        )
-        person1 = self.reload(self.person1, 'de')
-        self.assertEqual(
-            person1.safe_translation_getter('function'),
-            self.data['person1']['de']['function']
-        )
-
-    def test_comment(self):
-        person1 = self.reload(self.person1, 'en')
-        self.assertEqual(
-            person1.comment,
-            self.data['person1']['en']['description']
-        )
-        person1 = self.reload(self.person1, 'de')
-        self.assertEqual(
-            person1.comment,
-            self.data['person1']['de']['description']
-        )
-
-    def test_get_vcard(self):
-        person1 = self.reload(self.person1, 'en')
-        # Test with no group
-        vcard_en = ('BEGIN:VCARD\r\n'
-                    'VERSION:3.0\r\n'
-                    'FN:person1\r\n'
-                    'N:;person1;;;\r\n'
-                    'TITLE:function1\r\n'
-                    'END:VCARD\r\n')
-        self.assertEqual(
-            person1.get_vcard().decode('utf-8'),
-            vcard_en
-        )
-        # Test with a group and other fields populated
-        group1 = self.reload(self.group1, 'en')
-        group1.address = '123 Main Street'
-        group1.city = 'Anytown'
-        group1.postal_code = '12345'
-        group1.phone = '+1 (234) 567-8903'
-        group1.fax = '+1 (234) 567-8904'
-        group1.website = 'www.groupwebsite.com'
-        group1.save()
-        person1.groups.add(group1)
-        person1.email = 'person@org.org'
-        person1.phone = '+1 (234) 567-8900'
-        person1.mobile = '+1 (234) 567-8901'
-        person1.fax = '+1 (234) 567-8902'
-        person1.website = 'www.website.com'
-        person1.save()
-        vcard_en = ('BEGIN:VCARD\r\n'
-                    'VERSION:3.0\r\n'
-                    'FN:person1\r\n'
-                    'N:;person1;;;\r\n'
-                    'EMAIL:person@org.org\r\n'
-                    'TITLE:function1\r\n'
-                    'TEL;TYPE=WORK:+1 (234) 567-8900\r\n'
-                    'TEL;TYPE=CELL:+1 (234) 567-8901\r\n'
-                    'TEL;TYPE=FAX:+1 (234) 567-8902\r\n'
-                    'URL:www.website.com\r\n'
-                    'ORG:group1\r\n'
-                    'ADR;TYPE=WORK:;;123 Main Street;Anytown;;12345;\r\n'
-                    'TEL;TYPE=WORK:+1 (234) 567-8903\r\n'
-                    'TEL;TYPE=FAX:+1 (234) 567-8904\r\n'
-                    'URL:www.groupwebsite.com\r\n'
-                    'END:VCARD\r\n')
-        self.assertEqual(
-            person1.get_vcard().decode('utf-8'),
-            vcard_en
-        )
-        # Ensure this works for other langs too
-        person1 = self.reload(self.person1, 'de')
-        vcard_de = ('BEGIN:VCARD\r\n'
-                    'VERSION:3.0\r\n'
-                    'FN:mensch1\r\n'
-                    'N:;mensch1;;;\r\n'
-                    'EMAIL:person@org.org\r\n'
-                    'TITLE:Funktion1\r\n'
-                    'TEL;TYPE=WORK:+1 (234) 567-8900\r\n'
-                    'TEL;TYPE=CELL:+1 (234) 567-8901\r\n'
-                    'TEL;TYPE=FAX:+1 (234) 567-8902\r\n'
-                    'URL:www.website.com\r\n'
-                    'ORG:Gruppe1\r\n'
-                    'ADR;TYPE=WORK:;;123 Main Street;Anytown;;12345;\r\n'
-                    'TEL;TYPE=WORK:+1 (234) 567-8903\r\n'
-                    'TEL;TYPE=FAX:+1 (234) 567-8904\r\n'
-                    'URL:www.groupwebsite.com\r\n'
-                    'END:VCARD\r\n')
-        with override('de'):
-            self.assertEqual(
-                person1.get_vcard().decode('utf-8'),
-                vcard_de
-            )
-
-
-class TestGroupModelTranslation(BasePeopleTest):
-
-    def test_group_translation(self):
-        group1 = self.reload(self.group1, 'en')
-        self.assertEqual(group1.name, self.data['group1']['en']['name'])
-        group1 = self.reload(self.group1, 'de')
-        self.assertEqual(group1.name, self.data['group1']['de']['name'])
-
-    def test_company_name(self):
-        group1 = self.reload(self.group1, 'en')
-        self.assertEqual(
-            group1.company_name,
-            self.data['group1']['en']['name'],
-        )
-        group1 = self.reload(self.group1, 'de')
-        self.assertEqual(
-            group1.company_name,
-            self.data['group1']['de']['name'],
-        )
-
-    def test_company_description(self):
-        group1 = self.reload(self.group1, 'en')
-        self.assertEqual(
-            group1.company_description,
-            self.data['group1']['en']['description'],
-        )
-        group1 = self.reload(self.group1, 'de')
-        self.assertEqual(
-            group1.company_description,
-            self.data['group1']['de']['description'],
-        )
-
-    def test_str(self):
-        group1 = self.reload(self.group1, 'en')
-        self.assertEqual(
-            force_text(group1),
-            self.data['group1']['en']['name'],
-        )
-        group1 = self.reload(self.group1, 'de')
-        self.assertEqual(
-            force_text(group1),
-            self.data['group1']['de']['name'],
-        )
diff --git a/aldryn_people/tests/test_plugins.py b/aldryn_people/tests/test_plugins.py
deleted file mode 100644
index 1017db9b..00000000
--- a/aldryn_people/tests/test_plugins.py
+++ /dev/null
@@ -1,197 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.urls import reverse
-from django.utils.encoding import force_text
-
-from cms import api
-from cms.utils.i18n import force_language
-
-from aldryn_people import DEFAULT_APP_NAMESPACE
-
-from . import BasePeopleTest, DefaultApphookMixin
-from ..cms_plugins import PeoplePlugin
-from ..models import Group, Person
-
-
-class TestPersonPlugins(DefaultApphookMixin, BasePeopleTest):
-
-    def test_add_people_list_plugin_api(self):
-        """
-        We add a person to the People Plugin and look her up
-        """
-        name = 'Donald'
-        Person.objects.create(name=name)
-        plugin = api.add_plugin(self.placeholder, PeoplePlugin, self.language)
-        plugin.people.set(Person.objects.all())
-        self.assertEqual(force_text(plugin), force_text(plugin.pk))
-        self.page.publish(self.language)
-
-        url = self.page.get_absolute_url()
-        response = self.client.get(url, follow=True)
-        self.assertContains(response, name)
-
-    # This fails because of Sane Add Plugin (I suspect). This will be refactored
-    # and re-enabled in a future commit.
-    # def test_add_people_list_plugin_client(self):
-    #     """
-    #     We log into the PeoplePlugin
-    #     """
-    #     self.client.login(
-    #         username=self.su_username, password=self.su_password)
-    #
-    #     plugin_data = {
-    #         'plugin_type': 'PeoplePlugin',
-    #         'plugin_language': self.language,
-    #         'placeholder_id': self.placeholder.pk,
-    #     }
-    #     response = self.client.post(URL_CMS_PLUGIN_ADD, plugin_data)
-    #     self.assertEqual(response.status_code, 200)
-    #     self.assertTrue(CMSPlugin.objects.exists())
-
-    def test_hide_ungrouped(self):
-        """
-        """
-        the_bradys = Group.objects.create(name="The Bradys")
-        alice = Person.objects.create(name="Alice")
-        bobby = Person.objects.create(name="Bobby")
-        cindy = Person.objects.create(name="Cindy")
-        # Alice is the housekeeper, not a real Brady.
-        bobby.groups.add(the_bradys)
-        cindy.groups.add(the_bradys)
-
-        # Add a plugin where ungrouped people are not shown
-        plugin = api.add_plugin(self.placeholder, PeoplePlugin, self.language)
-        plugin.people.set(Person.objects.all())
-        plugin.group_by_group = True
-        plugin.show_ungrouped = False
-        plugin.save()
-
-        self.page.publish(self.language)
-        url = self.page.get_absolute_url()
-        response = self.client.get(url, follow=True)
-        self.assertContains(response, bobby.name)
-        self.assertContains(response, cindy.name)
-        self.assertNotContains(response, alice.name)
-
-    def test_show_ungrouped(self):
-        """
-        """
-        the_bradys = Group.objects.create(name="The Bradys")
-        alice = Person.objects.create(name="Alice")
-        bobby = Person.objects.create(name="Bobby")
-        cindy = Person.objects.create(name="Cindy")
-        # Alice is the housekeeper, not a real Brady.
-        bobby.groups.add(the_bradys)
-        cindy.groups.add(the_bradys)
-
-        # Now, add a new plugin where ungrouped people are shown
-        plugin = api.add_plugin(self.placeholder, PeoplePlugin, self.language)
-        plugin.people.set(Person.objects.all())
-        plugin.group_by_group = True
-        plugin.show_ungrouped = True
-        plugin.save()
-
-        self.page.publish(self.language)
-        url = self.page.get_absolute_url()
-        response = self.client.get(url, follow=True)
-        self.assertContains(response, bobby.name)
-        self.assertContains(response, cindy.name)
-        self.assertContains(response, alice.name)
-
-
-class TestPeopleListPluginNoApphook(BasePeopleTest):
-
-    def setUp(self):
-        super(TestPeopleListPluginNoApphook, self).setUp()
-        # we are testing only en
-        self.person1.set_current_language('en')
-        self.namespace = DEFAULT_APP_NAMESPACE
-
-    def create_plugin(self, plugin_params=None):
-        if plugin_params is None:
-            plugin_params = {}
-        with force_language('en'):
-            plugin = api.add_plugin(
-                self.placeholder, PeoplePlugin, 'en', **plugin_params)
-            self.page.publish('en')
-        return plugin
-
-    def test_plugin_with_no_apphook_doesnot_breaks_page(self):
-        self.create_plugin()
-        url = self.page.get_absolute_url()
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(response, self.person1.name)
-        from ..cms_plugins import NAMESPACE_ERROR
-        self.assertNotContains(response, NAMESPACE_ERROR[:20])
-
-    def test_plugin_with_no_apphook_shows_error_message(self):
-        self.create_plugin()
-        url = self.page.get_absolute_url()
-        self.client.login(username=self.su_username,
-                          password=self.su_password)
-        response = self.client.get(url, user=self.superuser)
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(response, self.person1.name)
-        from ..cms_plugins import NAMESPACE_ERROR
-        self.assertContains(response, NAMESPACE_ERROR[:20])
-
-    def test_plugin_with_vcard_enabled_no_apphook(self):
-        self.create_plugin(plugin_params={'show_vcard': True})
-        url = self.page.get_absolute_url()
-        response = self.client.get(url)
-        self.assertContains(response, self.person1.name)
-
-    def test_plugin_with_vcard_disabled_no_apphook(self):
-        self.create_plugin(plugin_params={'show_vcard': False})
-        url = self.page.get_absolute_url()
-        response = self.client.get(url)
-        self.assertContains(response, self.person1.name)
-
-    def test_plugin_show_links_are_shown_if_enabled_and_apphook_page(self):
-        with force_language('en'):
-            app_page = self.create_apphook_page()
-            list_plugin = api.add_plugin(
-                placeholder=self.placeholder,
-                plugin_type=PeoplePlugin,
-                language='en',
-            )
-            list_plugin.show_links = True
-            list_plugin.save()
-            self.page.publish('en')
-            url = self.page.get_absolute_url()
-            person_url = self.person1.get_absolute_url()
-            # ensure that url is not the link to the home page and not app page
-            app_page_len = len(app_page.get_absolute_url())
-            self.assertGreater(len(person_url), app_page_len)
-        response = self.client.get(url, follow=True)
-        self.assertContains(response, person_url)
-        # ensure that url is not shown if not enabled for plugin.
-        list_plugin.show_links = False
-        list_plugin.save()
-        self.page.publish('en')
-        response = self.client.get(url, follow=True)
-        self.assertNotContains(response, person_url)
-
-    def test_plugin_with_vcard_enabled_with_apphook(self):
-        vcard_kwargs = {
-            'slug': self.person1.slug
-        }
-        with force_language('en'):
-            self.create_apphook_page()
-            person_vcard_url = reverse(
-                '{0}:download_vcard'.format(self.namespace),
-                kwargs=vcard_kwargs)
-        plugin = self.create_plugin(plugin_params={'show_vcard': True})
-        url = self.page.get_absolute_url()
-        response = self.client.get(url, follow=True)
-        self.assertContains(response, self.person1.name)
-        self.assertContains(response, person_vcard_url)
-        # test that vcard download link is not shown if disabled
-        plugin.show_vcard = False
-        plugin.save()
-        self.page.publish('en')
-        response = self.client.get(url, follow=True)
-        self.assertContains(response, self.person1.name)
-        self.assertNotContains(response, person_vcard_url)
diff --git a/aldryn_people/tests/test_search_indexes.py b/aldryn_people/tests/test_search_indexes.py
deleted file mode 100644
index 9d52ace4..00000000
--- a/aldryn_people/tests/test_search_indexes.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
-from aldryn_people.search_indexes import PeopleIndex
-
-from . import BasePeopleTest
-from ..models import Person
-
-
-class TestPeopleIndex(BasePeopleTest):
-    def test_get_title(self):
-        idx_obj = PeopleIndex()
-        person1 = self.reload(self.person1, "en")
-        self.assertEqual(idx_obj.get_title(person1), person1.name)
-        person1 = self.reload(self.person1, "de")
-        self.assertEqual(idx_obj.get_title(person1), person1.name)
-
-    def test_get_index_kwargs(self):
-        # This is a silly test, but is here for completeness.
-        idx_obj = PeopleIndex()
-        self.assertEqual(idx_obj.get_index_kwargs("en"), {
-            'translations__language_code': 'en'
-        })
-
-    def test_get_index_queryset(self):
-        idx_obj = PeopleIndex()
-        # Person2 does NOT have an EN translation, so should appear here.
-        self.assertEqualItems(
-            [q.id for q in idx_obj.get_index_queryset("en")],
-            [self.person1.id],
-        )
-        # Both person objects have DE translations
-        self.assertEqualItems(
-            [q.id for q in idx_obj.get_index_queryset("de")],
-            [self.person1.id, self.person2.id],
-        )
-
-    def test_get_model(self):
-        # This is a silly test, but is here for completeness.
-        idx_obj = PeopleIndex()
-        self.assertEqual(idx_obj.get_model(), Person)
-
-    def test_get_search_data(self):
-        idx_obj = PeopleIndex()
-        person1 = self.reload(self.person1, "en")
-        search_data = idx_obj.get_search_data(person1, "en", None)
-        self.assertEqual(search_data, self.data['person1']['en']['description'])
diff --git a/aldryn_people/tests/test_toolbar.py b/aldryn_people/tests/test_toolbar.py
deleted file mode 100644
index 4047b079..00000000
--- a/aldryn_people/tests/test_toolbar.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
-from django.test import TransactionTestCase
-
-from ..cms_toolbars import get_admin_url
-
-
-class TestToolbarUtils(TransactionTestCase):
-
-    def test_get_admin_url(self):
-        # With pattern args, but no URL parameters
-        change_action = 'auth_user_change'
-        args = [1, ]
-        kwargs = {}
-        change_url = get_admin_url(change_action, args, **kwargs)
-
-        # With pattern args and a single URL parameter
-        kwargs = {'alpha': 'beta', }
-        url = get_admin_url(change_action, args, **kwargs)
-        self.assertIn(change_url + '?alpha=beta', url)
-
-        # With pattern args and two URL parameters
-        kwargs = {'alpha': 'beta', 'gamma': 'delta', }
-        url = get_admin_url(change_action, args, **kwargs)
-        self.assertIn(change_url + '?alpha=beta&gamma=delta', url)
-
-        # With pattern args and 3 URL parameters
-        kwargs = {'a': 'b', 'g': 'd', 'e': 'z', }
-        url = get_admin_url(change_action, args, **kwargs)
-        self.assertIn(change_url + '?a=b&e=z&g=d', url)
-
-        # With pattern args and numerical URL params
-        kwargs = {'a': 1, 'g': 2, 'e': 3, }
-        url = get_admin_url(change_action, args, **kwargs)
-        self.assertIn(change_url + '?a=1&e=3&g=2', url)
-
-        # With pattern args and odd-typed URL params
-        kwargs = {'a': [], 'g': {}, 'e': None}
-        url = get_admin_url(change_action, args, **kwargs)
-        self.assertIn(change_url + '?a=[]&e=None&g={}', url)
-
-        # No pattern args and no kwargs
-        add_action = 'auth_user_add'
-        add_url = get_admin_url(add_action)
-
-        # No pattern args...
-        add_action = 'auth_user_add'
-        kwargs = {'groups': 1, }
-        url = get_admin_url(add_action, **kwargs)
-        self.assertIn(add_url + '?groups=1', url)
diff --git a/aldryn_people/tests/test_views.py b/aldryn_people/tests/test_views.py
deleted file mode 100644
index 98fe3f92..00000000
--- a/aldryn_people/tests/test_views.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
-from django.http import Http404
-from django.test.client import RequestFactory
-from django.urls import reverse
-
-from cms.utils.i18n import force_language
-
-from . import BasePeopleTest, CMSRequestBasedTest, DefaultApphookMixin
-from ..views import DownloadVcardView
-
-
-class TestDownloadVcardView(DefaultApphookMixin,
-                            BasePeopleTest,
-                            CMSRequestBasedTest):
-
-    def test_as_view(self):
-        """Tests that DownloadVcardView produces the correct headers."""
-        person1 = self.reload(self.person1, "en")
-        person1.slug = 'person1-slug'
-        kwargs = {"slug": person1.slug}
-        person1_url = reverse('aldryn_people:person-detail', kwargs=kwargs)
-        factory = RequestFactory()
-        request = factory.get(person1_url)
-        response = DownloadVcardView.as_view()(request, **kwargs)
-        filename = '{0}.vcf'.format(person1.name)
-        self.assertEqual(
-            response["Content-Disposition"],
-            'attachment; filename="{0}"'.format(filename)
-        )
-        # Now, disable vcards for this person, and re-test
-        person1.vcard_enabled = False
-        person1.save()
-        with self.assertRaises(Http404):
-            request = factory.get(person1_url)
-            response = DownloadVcardView.as_view()(request, **kwargs)
-
-
-class TestMainListView(BasePeopleTest, CMSRequestBasedTest):
-
-    def test_list_view_with_only_en_apphook(self):
-        page = self.create_apphook_page(multilang=False)
-        # give some time for apphook reload middleware
-        self.client.get(page.get_absolute_url())
-
-        self.set_defalut_person_objects_current_language('en')
-        with force_language('en'):
-            url = page.get_absolute_url()
-            person1_url = self.person1.get_absolute_url()
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(response, self.person1.name)
-        self.assertContains(response, person1_url)
-        # should not contain person 2 since page for 'de' language is
-        # not published
-        self.assertNotContains(response, self.person2.name)
-        self.assertNotContains(response, self.person2.slug)
-
-    def test_list_view_with_en_and_de_apphook(self):
-        page = self.create_apphook_page(multilang=True)
-        # give some time for apphook reload middleware
-        self.client.get(page.get_absolute_url())
-        self.set_defalut_person_objects_current_language('en')
-        with force_language('en'):
-            url = page.get_absolute_url()
-            person1_url = self.person1.get_absolute_url()
-            person2_url = self.person2.get_absolute_url()
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(response, self.person1.name)
-        self.assertContains(response, self.person2.name)
-        self.assertContains(response, person1_url)
-        self.assertContains(response, person2_url)
diff --git a/gsoc/models.py b/gsoc/models.py
index 06d554ab..f0c373ee 100644
--- a/gsoc/models.py
+++ b/gsoc/models.py
@@ -171,7 +171,7 @@ def save(self, *args, **kwargs):
     attrs.update(settings.BLEACH_ALLOWED_ATTRS)
     styles = settings.BLEACH_ALLOWED_STYLES
     self.lead_in = bleach.clean(
-        self.lead_in, tags=tags, attributes=attrs, styles=styles
+        self.lead_in, tags=tags, attributes=attrs
     )
     soup = BeautifulSoup(self.lead_in, "html5lib")
     for iframe_tag in soup.find_all("iframe"):
@@ -207,14 +207,24 @@ class DaysConf(models.Model):
     disabled = models.BooleanField(default=False)
 
 
-PRE_BLOG_REMINDER = DaysConf.objects.get(title="PRE_BLOG_REMINDER")
-POST_BLOG_REMINDER_FIRST = DaysConf.objects.get(title="POST_BLOG_REMINDER_FIRST")
-POST_BLOG_REMINDER_SECOND = DaysConf.objects.get(title="POST_BLOG_REMINDER_SECOND")
+try:
+    PRE_BLOG_REMINDER = DaysConf.objects.get(title="PRE_BLOG_REMINDER")
+    POST_BLOG_REMINDER_FIRST = DaysConf.objects.get(title="POST_BLOG_REMINDER_FIRST")
+    POST_BLOG_REMINDER_SECOND = DaysConf.objects.get(title="POST_BLOG_REMINDER_SECOND")
 
-BLOG_POST_DUE_REMINDER = DaysConf.objects.get(title="BLOG_POST_DUE_REMINDER")
-UPDATE_BLOG_COUNTER = DaysConf.objects.get(title="UPDATE_BLOG_COUNTER")
+    BLOG_POST_DUE_REMINDER = DaysConf.objects.get(title="BLOG_POST_DUE_REMINDER")
+    UPDATE_BLOG_COUNTER = DaysConf.objects.get(title="UPDATE_BLOG_COUNTER")
 
-REGLINK_REMINDER = DaysConf.objects.get(title="REGLINK_REMINDER")
+    REGLINK_REMINDER = DaysConf.objects.get(title="REGLINK_REMINDER")
+except Exception:
+    PRE_BLOG_REMINDER = DaysConf(days=-3)
+    POST_BLOG_REMINDER_FIRST = DaysConf(days=1)
+    POST_BLOG_REMINDER_SECOND = DaysConf(days=3)
+
+    BLOG_POST_DUE_REMINDER = DaysConf(days=-6)
+    UPDATE_BLOG_COUNTER = DaysConf(days=6)
+
+    REGLINK_REMINDER = DaysConf(days=-3)
 
 
 class SubOrg(models.Model):
@@ -1624,11 +1634,14 @@ def send_comment_notification(sender, instance, **kwargs):
 def decrease_blog_counter(sender, instance, **kwargs):
     if not instance.pk:
         section = instance.app_config
-        up = UserProfile.objects.get(app_config=section)
-        if up.current_blog_count > 0:
-            up.current_blog_count -= 1
-            print("Decreasing", up.current_blog_count)
-            up.save()
+        try:
+            up = UserProfile.objects.get(app_config=section)
+            if up.current_blog_count > 0:
+                up.current_blog_count -= 1
+                print("Decreasing", up.current_blog_count)
+                up.save()
+        except Exception:
+            pass
 
 
 # Add ArticleReveiw object when new Article is created
diff --git a/settings_local.py.template b/settings_local.py.template
index e1c20f78..0e39151f 100644
--- a/settings_local.py.template
+++ b/settings_local.py.template
@@ -20,7 +20,7 @@ DATABASES = {
         "ENGINE": "django.db.backends.mysql",  # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
         "HOST": "",  # Set to empty string for localhost. Not used with sqlite3.
         "NAME": "python_blogs",  # Or path to database file if using sqlite3.
-        "PASSWORD": "",  # Not used with sqlite3.
+        "PASSWORD": "root",  # Not used with sqlite3.
         "PORT": "",  # Set to empty string for default. Not used with sqlite3.
         "USER": "root",  # Not used with sqlite3.
     }