EAGLESIX-2713: all test cases pass