less brittle controller tests