Improve test coverage
Fixes for cross-Python compatibility
Merge pull request #48 from mdboom/improve-coverage

Improve test coverage