Cleanup javadoc
Fix unit test