Added tests to the new generic Scheduler class