fix test for python3, pep8 spacing
Merge branch 'master' into ratematrix