Updated tests to accommodate changes in tested class
Fixed javadoc compilation error