Update views, Add all of the tests