Cleanup the tests to avoid duplication