Fixing coulpe silly things in this test.
Merge branch 'resharding'