More test fixing
Merge branch 'python3' of github.com:sontek/pyres into python3