use test.add_cleanup() for cleanup tasks
ws fix