ticket:5 fixed tests