Fix most of the view tets