ticket:9 fix tests