fix failing JPA test
fix failing Gemfire test
fix failing test