Fixed failing controller tests