Tidy up test groups