#KJ-37 Review todo-s. Resolved a part of todo-s spotted in the documentation and tests.