Fix tests
Merge pull request #240 from korczis/rest-merge

Fix tests