ticket:9 updated tests