[#7943] ticket:842 Rewrite tests
2 files changed