Updated to test against python 2.6