Fix test failures following ec68168010fe779712d30404b4182a66e56892bc