More test fixes. python 2.6 still having issues.