Generalize a couple more Map tests so that they can do double duty