Fix javadoc to reflect actual behavior
TAP5-2070 fix some tests