Correction to test results related to generation of 'dom' and 'rng' unary expressions
Fix for generation of map type that incorrectly used the Java standard library type