Starts retrofitting tests not to pass onyx-id around.