Fixed broken controller tests