test fixes on py26