backport test changes from another branch