Added additional information for javadoc and some minor testing