Fix javadoc warnings and test failure