Simplify tests for Github issue #535.

Author: riastradh-probcomp

tests/test_bql.py

@@ -1023,18 +1023,14 @@ def test_simulate_columns_subquery():
             ' order by name asc limit 2) from p1 limit 10')
 
 @pytest.mark.xfail(strict=True, reason='Github issue #535')
-def test_simulate_columns_subquery_broken0():
-    assert bql2sql('simulate weight, t1.(estimate * from columns of p1'
-            ' where probability of (mutual information with age < 1) > 0.8)'
-            ' from p1 limit 10') == \
-        'SELECT * FROM "bayesdb_temp_0";'
+def test_estimate_variables_estprob_broken0():
+    bql2sql('estimate * from variables of p1'
+        ' where probability of (mutual information with age < 1) > 0.8')
 
 @pytest.mark.xfail(strict=True, reason='Github issue #535')
-def test_simulate_columns_subquery_broken1():
-    assert bql2sql('simulate weight, t1.(estimate * from columns of p1'
-            ' order by probability of (mutual information with age < 1))'
-            ' from p1 limit 10') == \
-        'SELECT * FROM "bayesdb_temp_0";'
+def test_estimate_variables_estprob_broken1():
+    bql2sql('estimate * from variables of p1'
+        ' order by probability of (mutual information with age < 1)')
 
 def test_simulate_columns_all():
     with pytest.raises(parse.BQLParseError):