Fixes to view_tests, model_tests and resolver_tests