Cleanup JPA tests


These are some test cleanups that are required for the ORM 4.3.x compatibility patches, but are technically clean to apply at any time.