EAGLESIX-2695 Fixed some broken test cases.