Fixing tests after migrating to Maps.