Add some more test utility methods.
Fix for Django 1.6
Fix for Django 1.6