Fix SQL tests
Fix JPA tests