Fixed controller tests