Refactor groovy to java

Some light relief converting a few groovy test classes to java.
Nothing controversial, I think - straight forward conversions.