ticket:5 simplify views
ticket:5 fix tests