ObjectManager fix and test