Some simple updates to APITest.java

See commit comments.