Make controller tests pass.