Fix test failures on 2.2