Fix all controller tests!