Fix test setup
Merge pull request #231 from korczis/rest-merge

Fix test setup