Merge pull request #121 from youtube/resharding

Improving the worker test case.