Refactored some names, and added server testing for the entity manager