EAGLESIX-3087: Working toward new test cases