EAGLESIX-3087: Shard test cases now working