Cherrypick test fixes