Move unit tests to main project
Fix Javadoc issues
Fix package-private Javadoc issues