EAGLESIX-3003: Fixed up test cases.