ticket:1 fixed tests