ticket:4 fixed tests