Fixing broken controller tests