JC-1164 add javaDoc. Add unit Tests for change.