more py25 test fixes