#79271022 Fix several tests.