EAGLESIX-3083: All test cases pass