Add some integration tests for Watch controller.

Make the controllers non-shared services as having them shared makes
mocking $app much harder.