Cleanup tests: remove old code, fix user fixtures, etc
Merge pull request #435 from binarylogic/cleanup_tests

Cleanup tests: remove old code, fix user fixtures, etc