Backport test fixes