Refactoring
More testing

Properly test the two ScheduleTask methods