Final tidy up on the test machine