Fixing tests for python 2.6. Pushing test fixes for 3.x