Added testing TODOs required to catch up with Django trunk