Backport tests to match