Bug 1089455 - Fix tests.

Tests now also run under Python 2.6.