Fixing the tests which were broken by the introduction of views