Moving the remaining worm flag map tests where they should be