Fix subtly broken map() tests