tidy up SameMapper tests