[#7924] ticket:858 Fix tests
4 files changed