scheduler keeps running after test shut down
Merge pull request #289 from petercable/scheduler

scheduler keeps running after test shut down