Some final Java test polish, while we are at it