Move groovy tests into java source dir