Test shutdown then kill
Merge pull request #1120 from matthewrmshin/test-shutdown-then-kill-task

Test shutdown then kill