ticket:5 fix tests and view