Improved javadoc and a unit test per code review comments about REPORT-371