Follow up to clean up javadocs and add one more unit test - TRUNK-4214