Try to auto-fix tests for py3k