Get rid off complex controller tests