sharding-test-fixes