Improvement in the tests of the django_1.4_and_1.5 branch