fixed tests
revert restcontrollertest
Merge pull request #1259 from RoanKanninga/master

fix tests