KCINFR-979: fixing tests, javadoc typo
Merge pull request #276 from leoherbie/fix_merge_tests

KCINFR-979: fixing tests, javadoc typo