Merge "Refactor persistence JPA testing"