ticket:1 fix unit tests