More tests.
py26 fix