Lps 51565

CC @shinnlok

OrganizationImplTest is the only one depends on this, right?