Merge "Refactor ShardTest"