More progress on getting tests passing with the new CpEntityManager.