Make all unit tests pass on py3.3/3.4