Fix some of the tests
Merge pull request #251 from korczis/rest-merge

Fix some of the tests