EAGLESIX-2714: all test cases pass