diff --git a/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/bad-addition without left operator.sdstest b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/bad-addition without left operator.sdstest
new file mode 100644
index 000000000..93c549ea8
--- /dev/null
+++ b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/bad-addition without left operator.sdstest	
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    + 2;
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/bad-addition without right operator.sdstest b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/bad-addition without right operator.sdstest
new file mode 100644
index 000000000..8b6e73af0
--- /dev/null
+++ b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/bad-addition without right operator.sdstest	
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    1 +;
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/bad-division without left operator.sdstest b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/bad-division without left operator.sdstest
new file mode 100644
index 000000000..57a90363f
--- /dev/null
+++ b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/bad-division without left operator.sdstest	
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    / 2;
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/bad-division without right operator.sdstest b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/bad-division without right operator.sdstest
new file mode 100644
index 000000000..38081c762
--- /dev/null
+++ b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/bad-division without right operator.sdstest	
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    1 /;
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/bad-multiplication without left operator.sdstest b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/bad-multiplication without left operator.sdstest
new file mode 100644
index 000000000..60a5900f5
--- /dev/null
+++ b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/bad-multiplication without left operator.sdstest	
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    * 2;
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/bad-multiplication without right operator.sdstest b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/bad-multiplication without right operator.sdstest
new file mode 100644
index 000000000..b62d52f6f
--- /dev/null
+++ b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/bad-multiplication without right operator.sdstest	
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    1 *;
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/bad-negation without operator.sdstest b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/bad-negation without operator.sdstest
new file mode 100644
index 000000000..854267fb1
--- /dev/null
+++ b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/bad-negation without operator.sdstest	
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    -;
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/bad-subtraction without right operator.sdstest b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/bad-subtraction without right operator.sdstest
new file mode 100644
index 000000000..9dd3c100c
--- /dev/null
+++ b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/bad-subtraction without right operator.sdstest	
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    1 -;
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/good-addition.sdstest b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/good-addition.sdstest
new file mode 100644
index 000000000..f273ef1ef
--- /dev/null
+++ b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/good-addition.sdstest	
@@ -0,0 +1,5 @@
+// $TEST$ no_syntax_error
+
+pipeline myPipeline {
+    1 + 2;
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/arithmeticOperator.sdstest b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/good-complex example.sdstest
similarity index 61%
rename from DSL-langium/tests/resources/grammar/expressions/arithmeticOperator.sdstest
rename to DSL-langium/tests/resources/grammar/expressions/arithmetic operator/good-complex example.sdstest
index b331054e1..313f34cb8 100644
--- a/DSL-langium/tests/resources/grammar/expressions/arithmeticOperator.sdstest
+++ b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/good-complex example.sdstest	
@@ -1,11 +1,5 @@
 // $TEST$ no_syntax_error
 
 pipeline myPipeline {
-    1 + 2;
-    1 - 2;
-    1 * 2;
-    1 / 2;
-    -1;
-
     (1 + 2) * -3 / (1 - 4) + 5;
 }
diff --git a/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/good-division.sdstest b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/good-division.sdstest
new file mode 100644
index 000000000..ef34e2fd4
--- /dev/null
+++ b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/good-division.sdstest	
@@ -0,0 +1,5 @@
+// $TEST$ no_syntax_error
+
+pipeline myPipeline {
+    1 / 2;
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/good-multiplication.sdstest b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/good-multiplication.sdstest
new file mode 100644
index 000000000..e7b1bfb6c
--- /dev/null
+++ b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/good-multiplication.sdstest	
@@ -0,0 +1,5 @@
+// $TEST$ no_syntax_error
+
+pipeline myPipeline {
+    1 * 2;
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/good-negation.sdstest b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/good-negation.sdstest
new file mode 100644
index 000000000..1974fcb13
--- /dev/null
+++ b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/good-negation.sdstest	
@@ -0,0 +1,5 @@
+// $TEST$ no_syntax_error
+
+pipeline myPipeline {
+    -1;
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/good-subtraction.sdstest b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/good-subtraction.sdstest
new file mode 100644
index 000000000..7e5f92717
--- /dev/null
+++ b/DSL-langium/tests/resources/grammar/expressions/arithmetic operator/good-subtraction.sdstest	
@@ -0,0 +1,5 @@
+// $TEST$ no_syntax_error
+
+pipeline myPipeline {
+    1 - 2;
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/indexedAccess/bad-indexed access without index.sdstest b/DSL-langium/tests/resources/grammar/expressions/indexed access/bad-no index.sdstest
similarity index 100%
rename from DSL-langium/tests/resources/grammar/expressions/indexedAccess/bad-indexed access without index.sdstest
rename to DSL-langium/tests/resources/grammar/expressions/indexed access/bad-no index.sdstest
diff --git a/DSL-langium/tests/resources/grammar/expressions/indexed access/bad-unclosed square bracket.sdstest b/DSL-langium/tests/resources/grammar/expressions/indexed access/bad-unclosed square bracket.sdstest
new file mode 100644
index 000000000..9043c783d
--- /dev/null
+++ b/DSL-langium/tests/resources/grammar/expressions/indexed access/bad-unclosed square bracket.sdstest	
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline test {
+    a[;
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/indexedAccess/good-indexed access.sdstest b/DSL-langium/tests/resources/grammar/expressions/indexed access/good-literal index.sdstest
similarity index 84%
rename from DSL-langium/tests/resources/grammar/expressions/indexedAccess/good-indexed access.sdstest
rename to DSL-langium/tests/resources/grammar/expressions/indexed access/good-literal index.sdstest
index 6d40c5cf5..ff4ae34be 100644
--- a/DSL-langium/tests/resources/grammar/expressions/indexedAccess/good-indexed access.sdstest	
+++ b/DSL-langium/tests/resources/grammar/expressions/indexed access/good-literal index.sdstest	
@@ -2,5 +2,4 @@
 
 pipeline test {
     a[1];
-    a[b];
 }
diff --git a/DSL-langium/tests/resources/grammar/expressions/indexed access/good-reference index.sdstest b/DSL-langium/tests/resources/grammar/expressions/indexed access/good-reference index.sdstest
new file mode 100644
index 000000000..6dafc20c0
--- /dev/null
+++ b/DSL-langium/tests/resources/grammar/expressions/indexed access/good-reference index.sdstest	
@@ -0,0 +1,5 @@
+// $TEST$ no_syntax_error
+
+pipeline test {
+    a[b];
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/logical operation/bad-conjunction without left operator.sdstest b/DSL-langium/tests/resources/grammar/expressions/logical operation/bad-conjunction without left operator.sdstest
new file mode 100644
index 000000000..c8e3415bc
--- /dev/null
+++ b/DSL-langium/tests/resources/grammar/expressions/logical operation/bad-conjunction without left operator.sdstest	
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    and true;
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/logical operation/bad-conjunction without right operator.sdstest b/DSL-langium/tests/resources/grammar/expressions/logical operation/bad-conjunction without right operator.sdstest
new file mode 100644
index 000000000..3da7f5c06
--- /dev/null
+++ b/DSL-langium/tests/resources/grammar/expressions/logical operation/bad-conjunction without right operator.sdstest	
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    false and;
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/logical operation/bad-disjunction without left operator.sdstest b/DSL-langium/tests/resources/grammar/expressions/logical operation/bad-disjunction without left operator.sdstest
new file mode 100644
index 000000000..677b31b47
--- /dev/null
+++ b/DSL-langium/tests/resources/grammar/expressions/logical operation/bad-disjunction without left operator.sdstest	
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    or true;
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/logical operation/bad-disjunction without right operator.sdstest b/DSL-langium/tests/resources/grammar/expressions/logical operation/bad-disjunction without right operator.sdstest
new file mode 100644
index 000000000..13971f94c
--- /dev/null
+++ b/DSL-langium/tests/resources/grammar/expressions/logical operation/bad-disjunction without right operator.sdstest	
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    true or;
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/logical operation/bad-negation without operator.sdstest b/DSL-langium/tests/resources/grammar/expressions/logical operation/bad-negation without operator.sdstest
new file mode 100644
index 000000000..854267fb1
--- /dev/null
+++ b/DSL-langium/tests/resources/grammar/expressions/logical operation/bad-negation without operator.sdstest	
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    -;
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/logicalOperator.sdstest b/DSL-langium/tests/resources/grammar/expressions/logical operation/good-complex example.sdstest
similarity index 61%
rename from DSL-langium/tests/resources/grammar/expressions/logicalOperator.sdstest
rename to DSL-langium/tests/resources/grammar/expressions/logical operation/good-complex example.sdstest
index 295bca6f7..0a12be465 100644
--- a/DSL-langium/tests/resources/grammar/expressions/logicalOperator.sdstest
+++ b/DSL-langium/tests/resources/grammar/expressions/logical operation/good-complex example.sdstest	
@@ -1,9 +1,5 @@
 // $TEST$ no_syntax_error
 
 pipeline myPipeline {
-    false and true;
-    true or true;
-    not true;
-
     not true and false or true;
 }
diff --git a/DSL-langium/tests/resources/grammar/expressions/logical operation/good-conjunction.sdstest b/DSL-langium/tests/resources/grammar/expressions/logical operation/good-conjunction.sdstest
new file mode 100644
index 000000000..89fea66ff
--- /dev/null
+++ b/DSL-langium/tests/resources/grammar/expressions/logical operation/good-conjunction.sdstest	
@@ -0,0 +1,5 @@
+// $TEST$ no_syntax_error
+
+pipeline myPipeline {
+    false and true;
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/logical operation/good-disjunction.sdstest b/DSL-langium/tests/resources/grammar/expressions/logical operation/good-disjunction.sdstest
new file mode 100644
index 000000000..271891b9f
--- /dev/null
+++ b/DSL-langium/tests/resources/grammar/expressions/logical operation/good-disjunction.sdstest	
@@ -0,0 +1,5 @@
+// $TEST$ no_syntax_error
+
+pipeline myPipeline {
+    true or true;
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/logical operation/good-negation.sdstest b/DSL-langium/tests/resources/grammar/expressions/logical operation/good-negation.sdstest
new file mode 100644
index 000000000..30790c5de
--- /dev/null
+++ b/DSL-langium/tests/resources/grammar/expressions/logical operation/good-negation.sdstest	
@@ -0,0 +1,5 @@
+// $TEST$ no_syntax_error
+
+pipeline myPipeline {
+    not true;
+}