Fix view
Rewrite tests