Updated Model tests
WIP on View