Merge "Use exact type for objectUnderTest in groovy tests"