Got controller tests to pass finally