Backport test to staging