More python test fixes