Updated test results for generation of map enumeration expression
Moved functionality related to maps to a 'MapUtil' class