Fix test failures
Fix test failures

Capgemini/Apollo,phungmanhcuong/Appolo,Capgemini/Apollo,atsaki/Apollo,Capgemini/Apollo,ravbaba/Apollo,phungmanhcuong/Appolo,enxebre/Apollo,mehulsbhatt/Apollo,enxebre/Apollo,siliconmeadow/Apollo,ravbaba/Apollo,atsaki/Apollo,siliconmeadow/Apollo,mehulsbhatt/Apollo