test fixes for python 2.7