Fixed remaining tests
Merge pull request #257 from korczis/rest-merge

Fixed remaining tests