ticket:3 fixed tests