Add some more controller tests