Fix tests and add py26 to the test suite