ticket:13 fix tests