MDL-61410 question: fix unit tests failures