Modified for jpa test