Merge pull request #256 from korczis/rest-merge

Few more fixes
Changing some test to follow the new way
Fixed some missing params which occured during merge
Fixed remaining tests