fix failing 3_3_x tests
3 files changed