Refactored tests to work with Django 1.7