Cleaning and some more things in TestDriver