[NGRINDER-713] Fix test failure
[NGRINDER-713] Fix test failure
[NGRINDER-710] Fix test failure