[NGRINDER-592] Fix test failures