All tests now pass for python 2.6/2.7/3