Added in the scheduling and config change watch.  Also added in tests