[NGRINDER-694] Make unit test work again
[NGRINDER-684] Fix typo errors