Sharding logic test enhancement and more