EAGLESIX-3082: Fixed test cases.