Fixed another broken test

integration/test_constructors_models.py

@@ -49,15 +49,16 @@ bottom = [
         "instantiate_attribute", "1", "attr_optional", "name", "optional",
         "instantiate_attribute", "1", "attr_optional", "optional", False,
         "instantiate_attribute", "1", "attr_name", "optional", False,
+
+        "instantiate_node", "1", "Class", "ComplexAttribute",
+        "instantiate_link", "1", "", "Inheritance", "ComplexAttribute", "Attribute",
+
         "model_define_attribute", "1", "Class", "lower_cardinality", True, "Natural",
         "model_define_attribute", "1", "Class", "upper_cardinality", True, "Natural",
         "model_define_attribute", "1", "Association", "source_lower_cardinality", True, "Natural",
         "model_define_attribute", "1", "Association", "source_upper_cardinality", True, "Natural",
         "model_define_attribute", "1", "Association", "target_lower_cardinality", True, "Natural",
         "model_define_attribute", "1", "Association", "target_upper_cardinality", True, "Natural",
-
-        "instantiate_node", "1", "Class", "ComplexAttribute",
-        "instantiate_link", "1", "", "Inheritance", "ComplexAttribute", "Attribute",
         "model_define_attribute", "1", "ComplexAttribute", "type", False, "Location",
 
         "export_node", "1", "models/SimpleClassDiagrams_new",
@@ -201,15 +202,12 @@ instantiate_scd = [
         "instantiate_model", "1", "2",
         "instantiate_node", "2", "Class", "Place",
         "instantiate_node", "2", "Class", "Transition",
-        "instantiate_node", "2", "Class", "Natural",
+        "instantiate_node", "2", "SimpleAttribute", "Natural",
         "instantiate_link", "2", "Association", "P2T", "Place", "Transition",
         "instantiate_link", "2", "Association", "T2P", "Transition", "Place",
-        "instantiate_link", "2", "Association", "Place_tokens", "Place", "Natural",
-        "instantiate_attribute", "2", "Place_tokens", "name", "tokens",
-        "instantiate_link", "2", "Association", "P2T_weight", "P2T", "Natural",
-        "instantiate_attribute", "2", "P2T_weight", "name", "weight",
-        "instantiate_link", "2", "Association", "T2P_weight", "T2P", "Natural",
-        "instantiate_attribute", "2", "T2P_weight", "name", "weight",
+        "model_define_attribute", "2", "Place", "tokens", False, "Natural",
+        "model_define_attribute", "2", "P2T", "weight", False, "Natural",
+        "model_define_attribute", "2", "T2P", "weight", False, "Natural",
         "export_node", "2", "models/PetriNets_new",
         "exit",
     ]
@@ -242,10 +240,8 @@ instantiate_example = [
         "instantiate_node", "2", "Class", "B",
         "instantiate_node", "2", "Class", "C",
         "instantiate_link", "2", "Inheritance", "b_inherits_a", "B", "A",
-        "instantiate_link", "2", "Association", "A_tokens", "A", "B",
-        "instantiate_attribute", "2", "A_tokens", "name", "tokens",
-        "instantiate_link", "2", "Association", "C_tokens", "C", "B",
-        "instantiate_attribute", "2", "C_tokens", "name", "tokens",
+        "model_define_attribute", "2", "A", "tokens", "B",
+        "model_define_attribute", "2", "C", "tokens", "B",
         "export_node", "2", "models/example_MM",
         "exit",
         "model",