Fix test
Merge pull request #1228 from dennishendriksen/master

Return all entities instead of only jpa entities + small stuff
Merge pull request #1230 from erwinwinder/master

Fix test
Secure DataServiceImpl