diff --git a/submodules/test-resources/src/main/resources/testModels/libraries/ETL.crml b/submodules/test-resources/src/main/resources/testModels/libraries/ETL.crml
index 6f1e3522..0689dc79 100644
--- a/submodules/test-resources/src/main/resources/testModels/libraries/ETL.crml
+++ b/submodules/test-resources/src/main/resources/testModels/libraries/ETL.crml
@@ -14,7 +14,7 @@ library ETL is {
 	// Operators on clocks
 	// Filter clock ticks inside a time period
 	Operator [ Clock ] Clock C 'inside' Period P 
-		= C filter (tick C >= P start) and (tick C <= P end);
+		= C filter (tick C.element >= P start) and (tick C.element <= P end);
   
 	// Count the occurrences of events inside a time period
 	Operator [ Integer ] 'count' Clock C 'inside' Period P = card (C 'inside' P);
@@ -37,7 +37,7 @@ library ETL is {
 	// Operators for the evaluation of requirements
 	// Check
 	Operator [ Boolean ] 'check' Boolean phi 'over' Periods P 
-		= and ('evaluate' phi 'over' P);
+		= and ('evaluate' phi 'over' P.element);
   
 	// Evaluate
 	Operator [ Boolean ] 'evaluate' Boolean phi 'over' Period P 
@@ -45,7 +45,7 @@ library ETL is {
   
 	// Decide
 	// Operator 'decide' is 
-	Operator [ Boolean ] 'decide' Boolean phi 'over' Period P = phi 'or' (P end));
+	Operator [ Boolean ] 'decide' Boolean phi 'over' Period P = phi 'or' (new Boolean (P end));
   
 	Category c1 is Category increasing1 
 		= { (>, >), (>=, >=), (<, >=), (<=, >), (==, >), (<>, >) };