Fixes broken controller tests