SSR: javadoc matching fix and tests