Fix up the JPA test cases;