Again fixed all unit tests
Merge pull request #254 from korczis/rest-merge

Again fixed all unit tests