Fix views test. Again.
Merge it