fix tests
fix sort for JPA entities
Merge pull request #1239 from bartcharbon/master

fix tests + fix sort for jpa entities