update test to be python 2.6 compatible
Merge branch 'test-none-check' into 2.6-dev
Resolve merge conflicts