Fix java test suite