EAGLESIX-3082: Fixed the test cases.