Fix User's favorite org test
Fix missing org in sync plan tests