Added tests for views
Overwrite area name
Merge branch 'feature/refactor' into develop