Updated controller tests