Last bits to make tests pass on py3x