[NGRINDER-703] Fix test errors