Upgrade components to Django 1.6
Fix tests after upgrade to Django 1.6