update code and tests to match objectmanager