Refactoring; View tests;