Switched some test files to the object manager.