Tidy up of test