fix failing tests
fix for GRAILS-9023 "@TestFor doesn't work when test class doesn't end with Tests"
Merge branch '2.1.x' into 2.2.x