Backported tests
12 files changed