EAGLESIX-2695 Fiddled with the test cases.