Cleanup fixtures and basic tests
Cleanup main test file