upgraded to Django>=1.6 and fixed tests