Add test files to watch and make watch be the default task
Add test to controller.setup()