Improve test coverage
Fix Python 3.3 tests
Fix tests.
Merge pull request #49 from mdboom/test-coverage

Improve test coverage