Some test task cleanup