Refactor DynamicClusterTest from groovy to java (and tidies)