EAGLESIX-3082: Fixed up test cases.