test fixes

tests/run/genexpr_iterable_lookup_T600.pyx

@@ -18,7 +18,7 @@ def list_genexpr_iterable_lookup():
     return result
 
 @cython.test_assert_path_exists('//ComprehensionNode')
-@cython.test_fail_if_path_exists('//SimpleCallNode')
+@cython.test_fail_if_path_exists('//SingleAssignmentNode//SimpleCallNode')
 def genexpr_iterable_in_closure():
     """
     >>> genexpr_iterable_in_closure()

tests/run/list_comp_in_closure_T598.pyx

@@ -37,5 +37,5 @@ def genexpr_scope_in_closure():
         return i, x
     result = list( x*i for x in range(5) if x % 2 == 0 )
     assert x == 'abc' # don't leak in Py3 code
-    assert f() == 2,'abc' # don't leak in Py3 code
+    assert f() == (2,'abc') # don't leak in Py3 code
     return result