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