Second attempt to add groovy20 tests to the build