Updates to get tests running.
Updates to the object manager.