[#7923] ticket:827 Fix tests
6 files changed