Review round №1: fixed review comments in unit tests