Update tests for py3k.