Updated the views, refactoring tests