JAL-2480 test coverage / bug fixes / javadoc