Make Java tests Groovy again

Make Java tests Groovy again