Passing tests (removed controller tests)