Fixed Python 2.6 tests - part II.