Fix racey test
Minor javadoc