Javadoc fixes. Unit test passed.