Review followup, javadoc and tests