EAGLESIX-2651: Nary: tweak test class to match original