Merge "SF: Adding tests to Scheduler class."