[#7816] ticket:713 Fix/add tests
2 files changed