Correct test and cleanup