W.I.P. refactoring getting the EntityManager working and more structured table verification