some Py 2.6 unittest fixes