Added a switch to turn Schedule Watch on and off.

Also added some tests