added clientId and userId constants
Updated MapUtilTest