Tests refactored, base entity manager service