Filled out EntityManager methods and tests