Add controller tests