py2.6 is not supported anymore
fixed part of broken tests