final tidy up of tests