Fixed some misbehaviours regarding question() + added #import functionality when restoring

tests/core/test_SheerkaCreateNewConcept.py

@@ -215,7 +215,6 @@ class TestSheerkaCreateNewConcept(TestUsingMemoryBasedSheerka):
         assert sheerka.cache_manager.get(sheerka.CONCEPTS_REFERENCES_ENTRY, twenties.id) is None
 
 
-
 class TestSheerkaCreateNewConceptFileBased(TestUsingFileBasedSheerka):
     def test_i_can_add_several_concepts(self):
         sheerka = self.get_sheerka()

tests/core/test_builtin_helpers.py

@@ -146,8 +146,11 @@ class TestBuiltinHelpers(TestUsingMemoryBasedSheerka):
 
     @pytest.mark.parametrize("concepts, expected", [
         ([], []),
+        ([Concept("foo", pre="False"), Concept("bar")], ["bar"]),
         ([Concept("foo", pre="True"), Concept("bar")], ["foo"]),
-        ([Concept("foo").def_var("a"), Concept("bar")], ["bar"]),
+        ([Concept("foo").def_var("a"), Concept("bar")], ["bar"]),  # less variables is better
+        ([Concept("foo"), Concept("bar")], ["foo", "bar"]),
+        ([Concept("foo", pre="is_question()"), Concept("bar")], ["bar"]),
     ])
     def test_i_can_resolve_ambiguity_when_empty(self, concepts, expected):
         context = self.get_context()