More test cleanup and restructuring - drop java