EAGLESIX-2721: test cases adjusted