Fixed Javadoc
Modernized test for bad keys.  Added commented-out test for JAVA-820