Test Cleanup

Refactored for django 1.7 app-loading mechanism