diff --git a/polymorphic/tests/__init__.py b/polymorphic/tests/__init__.py
index bcf705a..89e3a94 100644
--- a/polymorphic/tests/__init__.py
+++ b/polymorphic/tests/__init__.py
@@ -1,5 +1,416 @@
 # -*- coding: utf-8 -*-
-from .models import *
+
+import django
+import uuid
+from django.db import models
+from django.db.models.query import QuerySet
+from django.contrib.contenttypes.models import ContentType
+
+from polymorphic.managers import PolymorphicManager
+from polymorphic.models import PolymorphicModel
+from polymorphic.query import PolymorphicQuerySet
+from polymorphic.showfields import ShowFieldContent, ShowFieldType, ShowFieldTypeAndContent
+
+try:
+    from django.db.models import UUIDField
+except ImportError:
+    # django<1.8
+    from polymorphic.tools_for_tests import UUIDField
+
+
+class PlainA(models.Model):
+    field1 = models.CharField(max_length=10)
+
+
+class PlainB(PlainA):
+    field2 = models.CharField(max_length=10)
+
+
+class PlainC(PlainB):
+    field3 = models.CharField(max_length=10)
+
+
+class Model2A(ShowFieldType, PolymorphicModel):
+    field1 = models.CharField(max_length=10)
+    polymorphic_showfield_deferred = True
+
+
+class Model2B(Model2A):
+    field2 = models.CharField(max_length=10)
+
+
+class Model2C(Model2B):
+    field3 = models.CharField(max_length=10)
+
+
+class Model2D(Model2C):
+    field4 = models.CharField(max_length=10)
+
+
+class ModelExtraA(ShowFieldTypeAndContent, PolymorphicModel):
+    field1 = models.CharField(max_length=10)
+
+
+class ModelExtraB(ModelExtraA):
+    field2 = models.CharField(max_length=10)
+
+
+class ModelExtraC(ModelExtraB):
+    field3 = models.CharField(max_length=10)
+
+
+class ModelExtraExternal(models.Model):
+    topic = models.CharField(max_length=10)
+
+
+class ModelShow1(ShowFieldType, PolymorphicModel):
+    field1 = models.CharField(max_length=10)
+    m2m = models.ManyToManyField('self')
+
+
+class ModelShow2(ShowFieldContent, PolymorphicModel):
+    field1 = models.CharField(max_length=10)
+    m2m = models.ManyToManyField('self')
+
+
+class ModelShow3(ShowFieldTypeAndContent, PolymorphicModel):
+    field1 = models.CharField(max_length=10)
+    m2m = models.ManyToManyField('self')
+
+
+class ModelShow1_plain(PolymorphicModel):
+    field1 = models.CharField(max_length=10)
+
+
+class ModelShow2_plain(ModelShow1_plain):
+    field2 = models.CharField(max_length=10)
+
+
+class Base(ShowFieldType, PolymorphicModel):
+    field_b = models.CharField(max_length=10)
+
+
+class ModelX(Base):
+    field_x = models.CharField(max_length=10)
+
+
+class ModelY(Base):
+    field_y = models.CharField(max_length=10)
+
+
+class Enhance_Plain(models.Model):
+    field_p = models.CharField(max_length=10)
+
+
+class Enhance_Base(ShowFieldTypeAndContent, PolymorphicModel):
+    base_id = models.AutoField(primary_key=True)
+    field_b = models.CharField(max_length=10)
+
+
+class Enhance_Inherit(Enhance_Base, Enhance_Plain):
+    field_i = models.CharField(max_length=10)
+
+
+class RelationBase(ShowFieldTypeAndContent, PolymorphicModel):
+    field_base = models.CharField(max_length=10)
+    fk = models.ForeignKey('self', null=True, related_name='relationbase_set')
+    m2m = models.ManyToManyField('self')
+
+
+class RelationA(RelationBase):
+    field_a = models.CharField(max_length=10)
+
+
+class RelationB(RelationBase):
+    field_b = models.CharField(max_length=10)
+
+
+class RelationBC(RelationB):
+    field_c = models.CharField(max_length=10)
+
+
+class RelatingModel(models.Model):
+    many2many = models.ManyToManyField(Model2A)
+
+
+class One2OneRelatingModel(PolymorphicModel):
+    one2one = models.OneToOneField(Model2A)
+    field1 = models.CharField(max_length=10)
+
+
+class One2OneRelatingModelDerived(One2OneRelatingModel):
+    field2 = models.CharField(max_length=10)
+
+
+class ModelUnderRelParent(PolymorphicModel):
+    field1 = models.CharField(max_length=10)
+    _private = models.CharField(max_length=10)
+
+
+class ModelUnderRelChild(PolymorphicModel):
+    parent = models.ForeignKey(ModelUnderRelParent, related_name='children')
+    _private2 = models.CharField(max_length=10)
+
+
+class MyManagerQuerySet(PolymorphicQuerySet):
+
+    def my_queryset_foo(self):
+        return self.all()  # Just a method to prove the existance of the custom queryset.
+
+
+class MyManager(PolymorphicManager):
+    queryset_class = MyManagerQuerySet
+
+    def get_queryset(self):
+        return super(MyManager, self).get_queryset().order_by('-field1')
+
+    def my_queryset_foo(self):
+        return self.all().my_queryset_foo()
+
+    # Django <= 1.5 compatibility
+    get_query_set = get_queryset
+
+
+class ModelWithMyManager(ShowFieldTypeAndContent, Model2A):
+    objects = MyManager()
+    field4 = models.CharField(max_length=10)
+
+
+class ModelWithMyManagerNoDefault(ShowFieldTypeAndContent, Model2A):
+    objects = PolymorphicManager()
+    my_objects = MyManager()
+    field4 = models.CharField(max_length=10)
+
+
+class ModelWithMyManagerDefault(ShowFieldTypeAndContent, Model2A):
+    my_objects = MyManager()
+    objects = PolymorphicManager()
+    field4 = models.CharField(max_length=10)
+
+
+if django.VERSION >= (1, 7):
+    class ModelWithMyManager2(ShowFieldTypeAndContent, Model2A):
+        objects = MyManagerQuerySet.as_manager()
+        field4 = models.CharField(max_length=10)
+
+
+class MROBase1(ShowFieldType, PolymorphicModel):
+    objects = MyManager()
+    field1 = models.CharField(max_length=10)  # needed as MyManager uses it
+
+
+class MROBase2(MROBase1):
+    pass  # Django vanilla inheritance does not inherit MyManager as _default_manager here
+
+
+class MROBase3(models.Model):
+    objects = PolymorphicManager()
+
+
+class MRODerived(MROBase2, MROBase3):
+    pass
+
+
+class ParentModelWithManager(PolymorphicModel):
+    pass
+
+
+class ChildModelWithManager(PolymorphicModel):
+    # Also test whether foreign keys receive the manager:
+    fk = models.ForeignKey(ParentModelWithManager, related_name='childmodel_set')
+    objects = MyManager()
+
+
+class PlainMyManagerQuerySet(QuerySet):
+
+    def my_queryset_foo(self):
+        return self.all()  # Just a method to prove the existance of the custom queryset.
+
+
+class PlainMyManager(models.Manager):
+
+    def my_queryset_foo(self):
+        return self.get_queryset().my_queryset_foo()
+
+    def get_queryset(self):
+        return PlainMyManagerQuerySet(self.model, using=self._db)
+
+    # Django <= 1.5 compatibility
+    get_query_set = get_queryset
+
+
+class PlainParentModelWithManager(models.Model):
+    pass
+
+
+class PlainChildModelWithManager(models.Model):
+    fk = models.ForeignKey(PlainParentModelWithManager, related_name='childmodel_set')
+    objects = PlainMyManager()
+
+
+class MgrInheritA(models.Model):
+    mgrA = models.Manager()
+    mgrA2 = models.Manager()
+    field1 = models.CharField(max_length=10)
+
+
+class MgrInheritB(MgrInheritA):
+    mgrB = models.Manager()
+    field2 = models.CharField(max_length=10)
+
+
+class MgrInheritC(ShowFieldTypeAndContent, MgrInheritB):
+    pass
+
+
+class BlogBase(ShowFieldTypeAndContent, PolymorphicModel):
+    name = models.CharField(max_length=10)
+
+
+class BlogA(BlogBase):
+    info = models.CharField(max_length=10)
+
+
+class BlogB(BlogBase):
+    pass
+
+
+class BlogEntry(ShowFieldTypeAndContent, PolymorphicModel):
+    blog = models.ForeignKey(BlogA)
+    text = models.CharField(max_length=10)
+
+
+class BlogEntry_limit_choices_to(ShowFieldTypeAndContent, PolymorphicModel):
+    blog = models.ForeignKey(BlogBase)
+    text = models.CharField(max_length=10)
+
+
+class ModelFieldNameTest(ShowFieldType, PolymorphicModel):
+    modelfieldnametest = models.CharField(max_length=10)
+
+
+class InitTestModel(ShowFieldType, PolymorphicModel):
+    bar = models.CharField(max_length=100)
+
+    def __init__(self, *args, **kwargs):
+        kwargs['bar'] = self.x()
+        super(InitTestModel, self).__init__(*args, **kwargs)
+
+
+class InitTestModelSubclass(InitTestModel):
+
+    def x(self):
+        return 'XYZ'
+
+# models from github issue
+
+
+class Top(PolymorphicModel):
+    name = models.CharField(max_length=50)
+
+
+class Middle(Top):
+    description = models.TextField()
+
+
+class Bottom(Middle):
+    author = models.CharField(max_length=50)
+
+
+class UUIDProject(ShowFieldTypeAndContent, PolymorphicModel):
+    uuid_primary_key = UUIDField(primary_key=True, default=uuid.uuid1)
+    topic = models.CharField(max_length=30)
+
+
+class UUIDArtProject(UUIDProject):
+    artist = models.CharField(max_length=30)
+
+
+class UUIDResearchProject(UUIDProject):
+    supervisor = models.CharField(max_length=30)
+
+
+class UUIDPlainA(models.Model):
+    uuid_primary_key = UUIDField(primary_key=True, default=uuid.uuid1)
+    field1 = models.CharField(max_length=10)
+
+
+class UUIDPlainB(UUIDPlainA):
+    field2 = models.CharField(max_length=10)
+
+
+class UUIDPlainC(UUIDPlainB):
+    field3 = models.CharField(max_length=10)
+
+# base -> proxy
+
+
+class ProxyBase(PolymorphicModel):
+    some_data = models.CharField(max_length=128)
+
+
+class ProxyChild(ProxyBase):
+
+    class Meta:
+        proxy = True
+
+
+class NonProxyChild(ProxyBase):
+    name = models.CharField(max_length=10)
+
+# base -> proxy -> real models
+
+
+class ProxiedBase(ShowFieldTypeAndContent, PolymorphicModel):
+    name = models.CharField(max_length=10)
+
+
+class ProxyModelBase(ProxiedBase):
+
+    class Meta:
+        proxy = True
+
+
+class ProxyModelA(ProxyModelBase):
+    field1 = models.CharField(max_length=10)
+
+
+class ProxyModelB(ProxyModelBase):
+    field2 = models.CharField(max_length=10)
+
+
+# test bad field name
+# class TestBadFieldModel(ShowFieldType, PolymorphicModel):
+#    instance_of = models.CharField(max_length=10)
+
+# validation error: "polymorphic.relatednameclash: Accessor for field 'polymorphic_ctype' clashes
+# with related field 'ContentType.relatednameclash_set'." (reported by Andrew Ingram)
+# fixed with related_name
+class RelatedNameClash(ShowFieldType, PolymorphicModel):
+    ctype = models.ForeignKey(ContentType, null=True, editable=False)
+
+# class with a parent_link to superclass, and a related_name back to subclass
+
+
+class TestParentLinkAndRelatedName(ModelShow1_plain):
+    superclass = models.OneToOneField(ModelShow1_plain, parent_link=True, related_name='related_name_subclass')
+
+
+class CustomPkBase(ShowFieldTypeAndContent, PolymorphicModel):
+    b = models.CharField(max_length=1)
+
+
+class CustomPkInherit(CustomPkBase):
+    custom_id = models.AutoField(primary_key=True)
+    i = models.CharField(max_length=1)
+
+
+class DateModel(PolymorphicModel):
+
+    date = models.DateTimeField()
+
+
+# Import tests
 from .test_orm import *
 from .test_multidb import *
 from .test_regression import *
diff --git a/polymorphic/tests/models.py b/polymorphic/tests/models.py
deleted file mode 100644
index 77fda0a..0000000
--- a/polymorphic/tests/models.py
+++ /dev/null
@@ -1,412 +0,0 @@
-import uuid
-
-import django
-from django.contrib.contenttypes.models import ContentType
-from django.db import models
-from django.db.models.query import QuerySet
-
-from polymorphic.managers import PolymorphicManager
-from polymorphic.models import PolymorphicModel
-from polymorphic.query import PolymorphicQuerySet
-from polymorphic.showfields import ShowFieldContent, ShowFieldType, ShowFieldTypeAndContent
-
-try:
-    from django.db.models import UUIDField
-except ImportError:
-    # django<1.8
-    from polymorphic.tools_for_tests import UUIDField
-
-
-class PlainA(models.Model):
-    field1 = models.CharField(max_length=10)
-
-
-class PlainB(PlainA):
-    field2 = models.CharField(max_length=10)
-
-
-class PlainC(PlainB):
-    field3 = models.CharField(max_length=10)
-
-
-class Model2A(ShowFieldType, PolymorphicModel):
-    field1 = models.CharField(max_length=10)
-    polymorphic_showfield_deferred = True
-
-
-class Model2B(Model2A):
-    field2 = models.CharField(max_length=10)
-
-
-class Model2C(Model2B):
-    field3 = models.CharField(max_length=10)
-
-
-class Model2D(Model2C):
-    field4 = models.CharField(max_length=10)
-
-
-class ModelExtraA(ShowFieldTypeAndContent, PolymorphicModel):
-    field1 = models.CharField(max_length=10)
-
-
-class ModelExtraB(ModelExtraA):
-    field2 = models.CharField(max_length=10)
-
-
-class ModelExtraC(ModelExtraB):
-    field3 = models.CharField(max_length=10)
-
-
-class ModelExtraExternal(models.Model):
-    topic = models.CharField(max_length=10)
-
-
-class ModelShow1(ShowFieldType, PolymorphicModel):
-    field1 = models.CharField(max_length=10)
-    m2m = models.ManyToManyField('self')
-
-
-class ModelShow2(ShowFieldContent, PolymorphicModel):
-    field1 = models.CharField(max_length=10)
-    m2m = models.ManyToManyField('self')
-
-
-class ModelShow3(ShowFieldTypeAndContent, PolymorphicModel):
-    field1 = models.CharField(max_length=10)
-    m2m = models.ManyToManyField('self')
-
-
-class ModelShow1_plain(PolymorphicModel):
-    field1 = models.CharField(max_length=10)
-
-
-class ModelShow2_plain(ModelShow1_plain):
-    field2 = models.CharField(max_length=10)
-
-
-class Base(ShowFieldType, PolymorphicModel):
-    field_b = models.CharField(max_length=10)
-
-
-class ModelX(Base):
-    field_x = models.CharField(max_length=10)
-
-
-class ModelY(Base):
-    field_y = models.CharField(max_length=10)
-
-
-class Enhance_Plain(models.Model):
-    field_p = models.CharField(max_length=10)
-
-
-class Enhance_Base(ShowFieldTypeAndContent, PolymorphicModel):
-    base_id = models.AutoField(primary_key=True)
-    field_b = models.CharField(max_length=10)
-
-
-class Enhance_Inherit(Enhance_Base, Enhance_Plain):
-    field_i = models.CharField(max_length=10)
-
-
-class RelationBase(ShowFieldTypeAndContent, PolymorphicModel):
-    field_base = models.CharField(max_length=10)
-    fk = models.ForeignKey('self', null=True, related_name='relationbase_set')
-    m2m = models.ManyToManyField('self')
-
-
-class RelationA(RelationBase):
-    field_a = models.CharField(max_length=10)
-
-
-class RelationB(RelationBase):
-    field_b = models.CharField(max_length=10)
-
-
-class RelationBC(RelationB):
-    field_c = models.CharField(max_length=10)
-
-
-class RelatingModel(models.Model):
-    many2many = models.ManyToManyField(Model2A)
-
-
-class One2OneRelatingModel(PolymorphicModel):
-    one2one = models.OneToOneField(Model2A)
-    field1 = models.CharField(max_length=10)
-
-
-class One2OneRelatingModelDerived(One2OneRelatingModel):
-    field2 = models.CharField(max_length=10)
-
-
-class ModelUnderRelParent(PolymorphicModel):
-    field1 = models.CharField(max_length=10)
-    _private = models.CharField(max_length=10)
-
-
-class ModelUnderRelChild(PolymorphicModel):
-    parent = models.ForeignKey(ModelUnderRelParent, related_name='children')
-    _private2 = models.CharField(max_length=10)
-
-
-class MyManagerQuerySet(PolymorphicQuerySet):
-
-    def my_queryset_foo(self):
-        return self.all()  # Just a method to prove the existance of the custom queryset.
-
-
-class MyManager(PolymorphicManager):
-    queryset_class = MyManagerQuerySet
-
-    def get_queryset(self):
-        return super(MyManager, self).get_queryset().order_by('-field1')
-
-    def my_queryset_foo(self):
-        return self.all().my_queryset_foo()
-
-    # Django <= 1.5 compatibility
-    get_query_set = get_queryset
-
-
-class ModelWithMyManager(ShowFieldTypeAndContent, Model2A):
-    objects = MyManager()
-    field4 = models.CharField(max_length=10)
-
-
-class ModelWithMyManagerNoDefault(ShowFieldTypeAndContent, Model2A):
-    objects = PolymorphicManager()
-    my_objects = MyManager()
-    field4 = models.CharField(max_length=10)
-
-
-class ModelWithMyManagerDefault(ShowFieldTypeAndContent, Model2A):
-    my_objects = MyManager()
-    objects = PolymorphicManager()
-    field4 = models.CharField(max_length=10)
-
-
-if django.VERSION >= (1, 7):
-    class ModelWithMyManager2(ShowFieldTypeAndContent, Model2A):
-        objects = MyManagerQuerySet.as_manager()
-        field4 = models.CharField(max_length=10)
-
-
-class MROBase1(ShowFieldType, PolymorphicModel):
-    objects = MyManager()
-    field1 = models.CharField(max_length=10)  # needed as MyManager uses it
-
-
-class MROBase2(MROBase1):
-    pass  # Django vanilla inheritance does not inherit MyManager as _default_manager here
-
-
-class MROBase3(models.Model):
-    objects = PolymorphicManager()
-
-
-class MRODerived(MROBase2, MROBase3):
-    pass
-
-
-class ParentModelWithManager(PolymorphicModel):
-    pass
-
-
-class ChildModelWithManager(PolymorphicModel):
-    # Also test whether foreign keys receive the manager:
-    fk = models.ForeignKey(ParentModelWithManager, related_name='childmodel_set')
-    objects = MyManager()
-
-
-class PlainMyManagerQuerySet(QuerySet):
-
-    def my_queryset_foo(self):
-        return self.all()  # Just a method to prove the existance of the custom queryset.
-
-
-class PlainMyManager(models.Manager):
-
-    def my_queryset_foo(self):
-        return self.get_queryset().my_queryset_foo()
-
-    def get_queryset(self):
-        return PlainMyManagerQuerySet(self.model, using=self._db)
-
-    # Django <= 1.5 compatibility
-    get_query_set = get_queryset
-
-
-class PlainParentModelWithManager(models.Model):
-    pass
-
-
-class PlainChildModelWithManager(models.Model):
-    fk = models.ForeignKey(PlainParentModelWithManager, related_name='childmodel_set')
-    objects = PlainMyManager()
-
-
-class MgrInheritA(models.Model):
-    mgrA = models.Manager()
-    mgrA2 = models.Manager()
-    field1 = models.CharField(max_length=10)
-
-
-class MgrInheritB(MgrInheritA):
-    mgrB = models.Manager()
-    field2 = models.CharField(max_length=10)
-
-
-class MgrInheritC(ShowFieldTypeAndContent, MgrInheritB):
-    pass
-
-
-class BlogBase(ShowFieldTypeAndContent, PolymorphicModel):
-    name = models.CharField(max_length=10)
-
-
-class BlogA(BlogBase):
-    info = models.CharField(max_length=10)
-
-
-class BlogB(BlogBase):
-    pass
-
-
-class BlogEntry(ShowFieldTypeAndContent, PolymorphicModel):
-    blog = models.ForeignKey(BlogA)
-    text = models.CharField(max_length=10)
-
-
-class BlogEntry_limit_choices_to(ShowFieldTypeAndContent, PolymorphicModel):
-    blog = models.ForeignKey(BlogBase)
-    text = models.CharField(max_length=10)
-
-
-class ModelFieldNameTest(ShowFieldType, PolymorphicModel):
-    modelfieldnametest = models.CharField(max_length=10)
-
-
-class InitTestModel(ShowFieldType, PolymorphicModel):
-    bar = models.CharField(max_length=100)
-
-    def __init__(self, *args, **kwargs):
-        kwargs['bar'] = self.x()
-        super(InitTestModel, self).__init__(*args, **kwargs)
-
-
-class InitTestModelSubclass(InitTestModel):
-
-    def x(self):
-        return 'XYZ'
-
-# models from github issue
-
-
-class Top(PolymorphicModel):
-    name = models.CharField(max_length=50)
-
-    class Meta:
-        ordering = ('pk',)
-
-
-class Middle(Top):
-    description = models.TextField()
-
-
-class Bottom(Middle):
-    author = models.CharField(max_length=50)
-
-
-class UUIDProject(ShowFieldTypeAndContent, PolymorphicModel):
-    uuid_primary_key = UUIDField(primary_key=True, default=uuid.uuid1)
-    topic = models.CharField(max_length=30)
-
-
-class UUIDArtProject(UUIDProject):
-    artist = models.CharField(max_length=30)
-
-
-class UUIDResearchProject(UUIDProject):
-    supervisor = models.CharField(max_length=30)
-
-
-class UUIDPlainA(models.Model):
-    uuid_primary_key = UUIDField(primary_key=True, default=uuid.uuid1)
-    field1 = models.CharField(max_length=10)
-
-
-class UUIDPlainB(UUIDPlainA):
-    field2 = models.CharField(max_length=10)
-
-
-class UUIDPlainC(UUIDPlainB):
-    field3 = models.CharField(max_length=10)
-
-# base -> proxy
-
-
-class ProxyBase(PolymorphicModel):
-    some_data = models.CharField(max_length=128)
-
-
-class ProxyChild(ProxyBase):
-
-    class Meta:
-        proxy = True
-
-
-class NonProxyChild(ProxyBase):
-    name = models.CharField(max_length=10)
-
-# base -> proxy -> real models
-
-
-class ProxiedBase(ShowFieldTypeAndContent, PolymorphicModel):
-    name = models.CharField(max_length=10)
-
-
-class ProxyModelBase(ProxiedBase):
-
-    class Meta:
-        proxy = True
-
-
-class ProxyModelA(ProxyModelBase):
-    field1 = models.CharField(max_length=10)
-
-
-class ProxyModelB(ProxyModelBase):
-    field2 = models.CharField(max_length=10)
-
-
-# test bad field name
-# class TestBadFieldModel(ShowFieldType, PolymorphicModel):
-#    instance_of = models.CharField(max_length=10)
-
-# validation error: "polymorphic.relatednameclash: Accessor for field 'polymorphic_ctype' clashes
-# with related field 'ContentType.relatednameclash_set'." (reported by Andrew Ingram)
-# fixed with related_name
-class RelatedNameClash(ShowFieldType, PolymorphicModel):
-    ctype = models.ForeignKey(ContentType, null=True, editable=False)
-
-# class with a parent_link to superclass, and a related_name back to subclass
-
-
-class TestParentLinkAndRelatedName(ModelShow1_plain):
-    superclass = models.OneToOneField(ModelShow1_plain, parent_link=True, related_name='related_name_subclass')
-
-
-class CustomPkBase(ShowFieldTypeAndContent, PolymorphicModel):
-    b = models.CharField(max_length=1)
-
-
-class CustomPkInherit(CustomPkBase):
-    custom_id = models.AutoField(primary_key=True)
-    i = models.CharField(max_length=1)
-
-
-class DateModel(PolymorphicModel):
-
-    date = models.DateTimeField()
diff --git a/polymorphic/tests/test_models.py b/polymorphic/tests/test_models.py
new file mode 100644
index 0000000..e69de29
diff --git a/polymorphic/tests/test_multidb.py b/polymorphic/tests/test_multidb.py
index 5308abd..9d23799 100644
--- a/polymorphic/tests/test_multidb.py
+++ b/polymorphic/tests/test_multidb.py
@@ -1,11 +1,12 @@
 from __future__ import print_function
+
 import django
 from django.contrib.contenttypes.models import ContentType
 
 from django.test import TestCase
 from django.db.models import Q
 
-from .models import *
+from polymorphic.tests import *  # all models
 
 try:
     from unittest import skipIf
diff --git a/polymorphic/tests/test_orm.py b/polymorphic/tests/test_orm.py
index 5bc57d2..5567e50 100644
--- a/polymorphic/tests/test_orm.py
+++ b/polymorphic/tests/test_orm.py
@@ -1,16 +1,13 @@
 from __future__ import print_function
-import uuid
 import re
-import django
 
+import django
 from django.test import TestCase
 from django.db.models import Q, Count
-from django.db import models
 from django.utils import six
+from polymorphic.tests import *  # all models
 
 from polymorphic.contrib.guardian import get_polymorphic_base_content_type
-from polymorphic.managers import PolymorphicManager
-from .models import *
 
 try:
     from unittest import skipIf
@@ -273,25 +270,25 @@ class PolymorphicTests(TestCase):
                 repr(model._base_manager.model)
             )
 
-        self.assertEqual(show_base_manager(PlainA), "<class 'django.db.models.manager.Manager'> <class 'polymorphic.tests.models.PlainA'>")
-        self.assertEqual(show_base_manager(PlainB), "<class 'django.db.models.manager.Manager'> <class 'polymorphic.tests.models.PlainB'>")
-        self.assertEqual(show_base_manager(PlainC), "<class 'django.db.models.manager.Manager'> <class 'polymorphic.tests.models.PlainC'>")
+        self.assertEqual(show_base_manager(PlainA), "<class 'django.db.models.manager.Manager'> <class 'polymorphic.tests.PlainA'>")
+        self.assertEqual(show_base_manager(PlainB), "<class 'django.db.models.manager.Manager'> <class 'polymorphic.tests.PlainB'>")
+        self.assertEqual(show_base_manager(PlainC), "<class 'django.db.models.manager.Manager'> <class 'polymorphic.tests.PlainC'>")
 
-        self.assertEqual(show_base_manager(Model2A), "<class 'polymorphic.managers.PolymorphicManager'> <class 'polymorphic.tests.models.Model2A'>")
+        self.assertEqual(show_base_manager(Model2A), "<class 'polymorphic.managers.PolymorphicManager'> <class 'polymorphic.tests.Model2A'>")
         if django.VERSION >= (1, 10):
             # The new inheritance makes all model levels polymorphic
-            self.assertEqual(show_base_manager(Model2B), "<class 'polymorphic.managers.PolymorphicManager'> <class 'polymorphic.tests.models.Model2B'>")
-            self.assertEqual(show_base_manager(Model2C), "<class 'polymorphic.managers.PolymorphicManager'> <class 'polymorphic.tests.models.Model2C'>")
+            self.assertEqual(show_base_manager(Model2B), "<class 'polymorphic.managers.PolymorphicManager'> <class 'polymorphic.tests.Model2B'>")
+            self.assertEqual(show_base_manager(Model2C), "<class 'polymorphic.managers.PolymorphicManager'> <class 'polymorphic.tests.Model2C'>")
         else:
-            self.assertEqual(show_base_manager(Model2B), "<class 'django.db.models.manager.Manager'> <class 'polymorphic.tests.models.Model2B'>")
-            self.assertEqual(show_base_manager(Model2C), "<class 'django.db.models.manager.Manager'> <class 'polymorphic.tests.models.Model2C'>")
+            self.assertEqual(show_base_manager(Model2B), "<class 'django.db.models.manager.Manager'> <class 'polymorphic.tests.Model2B'>")
+            self.assertEqual(show_base_manager(Model2C), "<class 'django.db.models.manager.Manager'> <class 'polymorphic.tests.Model2C'>")
 
-        self.assertEqual(show_base_manager(One2OneRelatingModel), "<class 'polymorphic.managers.PolymorphicManager'> <class 'polymorphic.tests.models.One2OneRelatingModel'>")
+        self.assertEqual(show_base_manager(One2OneRelatingModel), "<class 'polymorphic.managers.PolymorphicManager'> <class 'polymorphic.tests.One2OneRelatingModel'>")
         if django.VERSION >= (1, 10):
             # The new inheritance makes all model levels polymorphic
-            self.assertEqual(show_base_manager(One2OneRelatingModelDerived), "<class 'polymorphic.managers.PolymorphicManager'> <class 'polymorphic.tests.models.One2OneRelatingModelDerived'>")
+            self.assertEqual(show_base_manager(One2OneRelatingModelDerived), "<class 'polymorphic.managers.PolymorphicManager'> <class 'polymorphic.tests.One2OneRelatingModelDerived'>")
         else:
-            self.assertEqual(show_base_manager(One2OneRelatingModelDerived), "<class 'django.db.models.manager.Manager'> <class 'polymorphic.tests.models.One2OneRelatingModelDerived'>")
+            self.assertEqual(show_base_manager(One2OneRelatingModelDerived), "<class 'django.db.models.manager.Manager'> <class 'polymorphic.tests.One2OneRelatingModelDerived'>")
 
     def test_instance_default_manager(self):
         def show_default_manager(instance):
@@ -308,13 +305,13 @@ class PolymorphicTests(TestCase):
         model_2b = Model2B(field2='C1')
         model_2c = Model2C(field3='C1')
 
-        self.assertEqual(show_default_manager(plain_a), "<class 'django.db.models.manager.Manager'> <class 'polymorphic.tests.models.PlainA'>")
-        self.assertEqual(show_default_manager(plain_b), "<class 'django.db.models.manager.Manager'> <class 'polymorphic.tests.models.PlainB'>")
-        self.assertEqual(show_default_manager(plain_c), "<class 'django.db.models.manager.Manager'> <class 'polymorphic.tests.models.PlainC'>")
+        self.assertEqual(show_default_manager(plain_a), "<class 'django.db.models.manager.Manager'> <class 'polymorphic.tests.PlainA'>")
+        self.assertEqual(show_default_manager(plain_b), "<class 'django.db.models.manager.Manager'> <class 'polymorphic.tests.PlainB'>")
+        self.assertEqual(show_default_manager(plain_c), "<class 'django.db.models.manager.Manager'> <class 'polymorphic.tests.PlainC'>")
 
-        self.assertEqual(show_default_manager(model_2a), "<class 'polymorphic.managers.PolymorphicManager'> <class 'polymorphic.tests.models.Model2A'>")
-        self.assertEqual(show_default_manager(model_2b), "<class 'polymorphic.managers.PolymorphicManager'> <class 'polymorphic.tests.models.Model2B'>")
-        self.assertEqual(show_default_manager(model_2c), "<class 'polymorphic.managers.PolymorphicManager'> <class 'polymorphic.tests.models.Model2C'>")
+        self.assertEqual(show_default_manager(model_2a), "<class 'polymorphic.managers.PolymorphicManager'> <class 'polymorphic.tests.Model2A'>")
+        self.assertEqual(show_default_manager(model_2b), "<class 'polymorphic.managers.PolymorphicManager'> <class 'polymorphic.tests.Model2B'>")
+        self.assertEqual(show_default_manager(model_2c), "<class 'polymorphic.managers.PolymorphicManager'> <class 'polymorphic.tests.Model2C'>")
 
     def test_foreignkey_field(self):
         self.create_model2abcd()
diff --git a/polymorphic/tests/test_regression.py b/polymorphic/tests/test_regression.py
index 47310b7..3766dba 100644
--- a/polymorphic/tests/test_regression.py
+++ b/polymorphic/tests/test_regression.py
@@ -1,5 +1,5 @@
 from django.test import TestCase
-from .models import Top, Middle, Bottom
+from . import Top, Middle, Bottom
 
 
 class RegressionTests(TestCase):
@@ -15,10 +15,10 @@ class RegressionTests(TestCase):
         bottom.save()
 
         expected_queryset = [top, middle, bottom]
-        self.assertQuerysetEqual(Top.objects.all(), [repr(r) for r in expected_queryset])
+        self.assertQuerysetEqual(Top.objects.order_by('pk'), [repr(r) for r in expected_queryset])
 
         expected_queryset = [middle, bottom]
-        self.assertQuerysetEqual(Middle.objects.all(), [repr(r) for r in expected_queryset])
+        self.assertQuerysetEqual(Middle.objects.order_by('pk'), [repr(r) for r in expected_queryset])
 
         expected_queryset = [bottom]
-        self.assertQuerysetEqual(Bottom.objects.all(), [repr(r) for r in expected_queryset])
+        self.assertQuerysetEqual(Bottom.objects.order_by('pk'), [repr(r) for r in expected_queryset])