Further expansion of tests (esp. views-of-views)