Add a bit more testing for shards