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

Fix tests