minor test cleanups, adding tests for the entity manager options