fix test failures on newest pythons
Merge pull request #402 from jschneier/fix-test-failures

fix test failures on newest pythons