Add more complete controller tests