More tests and javadoc
More unit testing