Make tests pass with Django-1.3