cleaning up javadoc
improved testing coverage