Fix failing map tests under osx