Fix test failures
3 files changed