Fixing view/controller tests.