fix JUnit test and move persistence.xml