patch up tests, add one for /agencies/. Move template, rename view.