ticket:5 for #5 tests updated