Fix JUnit persitence.xml and optimize demoData