Schedule in one turn, closes #16
Test case updated
Merge remote-tracking branch 'origin/schedule'