Fix test 16 for Java and some minor cleanup for Java and the README