initial
fix broken python3 and python2.5 tests
Merged in bubenkoff/pytest/fix-broken-tests (pull request #65)

Fix broken python3 and python2.5 tests