Fix tests that broke due to restructure of views