EAGLESIX-3087: More work on test cases