Fixes for differences in unit testing capabilities of python2.6