Fix javadoc
introducing test utilities
adding more tests