Finish additional tests and refactoring view pages