py2.6 compat
one test was overwritten
one test was not asserting
flake8 fixes