Enhancement: Simplify controller tests