add controller-test to scaffold deps.
rename some of the deps