Fix broken tests.  Add model, template, and locale generators as dependencies of controller.