Use readable condition style
Don't use deprecated assert_ test calls
pep8 / pyflakes

Make test suite pass again, partially doing unrelated stuff to current
branch / pull request.