[NGRINDER-690] Enhance architecture to provide full REST APIs - Fix bug.
[NGRINDER-694] Make unit test work again