Updated map tests according to lastest changes