make Map.group() handle nulls better
fix incorrect test