JavaDoc edits
Added additional tests