Enhancement: Simplify controller tests
Fix: Increase meaningfulness of test