More Unit tests and Javadocs