Fixed some bugs in the persistence.xml, used for test-cases