tweaks and fixes for tests

See individual commits for actual changes
@czue To testing this I started specific tests via
./manage.py test <app_name>.<TestClass>.<test_name>