test: Unmerged fixes
3 files changed