Switched more tests to the object manager.