EAGLESIX-2715: all test cases pass