Switched some more tests to the object manager.