Clean up properly before running tests