Updates to Java driver tests