Re-add remainder of tests, manage.py