Some javadoc modification + some tests