Fixed 001A Java tests a bit.
Merge remote-tracking branch 'upstream/master'