Finish changing org label to numeric ID for API

Still having 3 errors when running API content views tests due to a bug that is overriding related organization object.