EAGLESIX-2651: Nary: more fixes for test cases