Cleaning up worm and dihedral tests