[#4187] ticket:69 expand test and fix functionality
2 files changed