Fix controller tests
Fix unit test after factory change