Updated tests to accomodate Scheduler refactoring.