Clean up of test tasks