remove Java specific syntax
created ReturnValues to hold multiple return values for a map style Groovy mock to simplify Groovy mock creation