Improved JPAServiceTest