Tidy up of tests