Added set of controller tests