Fixed javadoc errors.
Fixed test code.