Cleanup and add fixtures for new tests.