Fixed failing map tests