Adjust cleanup params for tests