test fixes for py3k