Fixing map-tests