[#4542] ticket:728 Add more test + refactoring
4 files changed