Add --watcher=polling option to Test command.

Closes #2099.
Updated again to remove the leading underscore (as mentioned in another comment).