Tests added
Javadoc improved