Single Worker Shutdown Tests

Tests for single worker shutdown and fix for ignoring cleanup in this case.  Hopefully this doesn't conflict with your changes.