Add --watcher=polling option to Test command.

Closes #2099.
lets pass these in via the contructor