controller tests cleanup