Minor test fix and Groovy version upgrade to 2.2.1