Update TestScheduler to match merged Scheduler changes

- I accidentally merged this code before fixing it to match the changes to AbstractScheduler/Scheduler
Merge pull request #240 from benjchristensen/fix-TestScheduler

Update TestScheduler to match merged Scheduler changes