EAGLESIX-3087: Changes for shard tests