[No Ticket][Risk=no] Fix tests (#1829)
[No Ticket][Risk=no] Fix tests (#1829)


all-of-us/workbench,all-of-us/workbench,all-of-us/workbench,all-of-us/workbench,all-of-us/workbench,all-of-us/workbench,all-of-us/workbench,all-of-us/workbench,all-of-us/workbench