diff --git a/src/main/scala/org/rosi_project/model_sync/generator/sync/QueryMethods.scala b/src/main/scala/org/rosi_project/model_sync/generator/sync/QueryMethods.scala
index 857bf7ecd7c272ff6e4fbb5c0c511c7d719cfd0a..560a1fe00dffb3e6620f0d8650a700db3e93fa20 100644
--- a/src/main/scala/org/rosi_project/model_sync/generator/sync/QueryMethods.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/sync/QueryMethods.scala
@@ -133,7 +133,7 @@ object QueryMethods  {
         result = PredefTypes.Boolean,
         params = Seq(SMethodParameter("v", targetClass)),
         implementation = Seq(SMethodStatement(content = "if (v == null) return false", usedTypes = Set.empty),
-            SMethodStatement(content = "if (!containsRole(v.asInstanceOf[AQueryViewRole])) return false", usedTypes = Set.empty),
+            SMethodStatement(content = s"if (!containsRole(v.asInstanceOf[${PredefRsumTypes.AQUERY_VIEW_ROLE_STYPE.getName}])) return false", usedTypes = Set.empty),
             SMethodStatement(content = s"if (${realRef.getName} != null) {", usedTypes = Set.empty),
             SMethodStatement(content = s"if (${realRef.getName}.${getStatement}() == v) return false", usedTypes = Set.empty),
             SMethodStatement(content = s"${realRef.getName}.deleteElement()", usedTypes = Set.empty),
@@ -183,7 +183,7 @@ object QueryMethods  {
         name = s"add${realRef.getName.capitalize}",
         result = PredefTypes.Boolean,
         params = Seq(SMethodParameter("v", targetClass)),
-        implementation = Seq(SMethodStatement(content = s"if (has${realRef.getName.capitalize}(v) || !containsRole(v.asInstanceOf[AQueryViewRole])) return false", usedTypes = Set.empty),
+        implementation = Seq(SMethodStatement(content = s"if (has${realRef.getName.capitalize}(v) || !containsRole(v.asInstanceOf[${PredefRsumTypes.AQUERY_VIEW_ROLE_STYPE.getName}])) return false", usedTypes = Set.empty),
             SMethodStatement(content = s"new ${refClass.getName}${thisStatement}", usedTypes = Set.empty),
             SMethodStatement(content = "return true", usedTypes = Set.empty))))
       sourceClass.addMethod(new SMethod(
diff --git a/src/main/scala/org/rosi_project/model_sync/generator/test/ApplicationTest.scala b/src/main/scala/org/rosi_project/model_sync/generator/test/ApplicationTest.scala
index 98b06370deac6164e1b3b7070c305d62cca446ce..a2c5a44de066da26435ae2b5fad7aad5cf543696 100644
--- a/src/main/scala/org/rosi_project/model_sync/generator/test/ApplicationTest.scala
+++ b/src/main/scala/org/rosi_project/model_sync/generator/test/ApplicationTest.scala
@@ -7,10 +7,10 @@ import org.rosi_project.model_sync.generator.Creation
 
 object ApplicationTest extends App {
       
-  runTestLibrary(Creation.rolesum)
+  //runTestLibrary(Creation.rolesum)
   //runCombinedTest(Creation.rolesum)
   //runShrinkingModel(Creation.rolesum)
-  //runTestAML(Creation.rolesum)
+  runTestAML(Creation.rolesum)
   
   //TTC Case examples
   //runTTC2019(Creation.rolecomb)