EAGLESIX-2698: test cases passing