fix comments
core-5894 fix unit tests