May 8th- JPA Tests

Updated with corrections as per your May 5th e-mail.