ticket:6 updated tests