Updated tests and code to work with 2.4.x release of django-rest-framework.

Tested it out with Django 1.4-1.6 and DRF 2.2-2.4.