Javadoc updates, more JUnit tests