Redone controller tests