make tests pass on 3.2