Refactoring views

- fixed test and views.