Rename tests modules for Django 1.6 (ref #787)
Fix tests after upgrades
Remove usage of depth