diff --git a/circus.robocalc.robochart.textual.tests/META-INF/MANIFEST.MF b/circus.robocalc.robochart.textual.tests/META-INF/MANIFEST.MF
index 69aafb0..8c2cd93 100755
--- a/circus.robocalc.robochart.textual.tests/META-INF/MANIFEST.MF
+++ b/circus.robocalc.robochart.textual.tests/META-INF/MANIFEST.MF
@@ -11,7 +11,8 @@ Require-Bundle: circus.robocalc.robochart.textual,
  org.junit.jupiter.api;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.xtext.testing;bundle-version="2.25.0",
  org.eclipse.xtext.xbase.testing;bundle-version="2.25.0",
- org.eclipse.xtext.xbase.lib;bundle-version="2.25.0"
+ org.eclipse.xtext.xbase.lib;bundle-version="2.25.0",
+ org.eclipse.core.runtime;bundle-version="3.24.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: circus.robocalc.robochart.textual.tests;x-internal=true
 
diff --git a/circus.robocalc.robochart.textual.tests/pom.xml b/circus.robocalc.robochart.textual.tests/pom.xml
index 4479ed2..6bc94ec 100755
--- a/circus.robocalc.robochart.textual.tests/pom.xml
+++ b/circus.robocalc.robochart.textual.tests/pom.xml
@@ -28,11 +28,20 @@ Version Update 3.1.0 : Nov 2022
 				<groupId>org.eclipse.xtend</groupId>
 				<artifactId>xtend-maven-plugin</artifactId>
 			</plugin>
+			<!-- <plugin>
+		        <groupId>org.eclipse.tycho</groupId>
+		        <artifactId>tycho-surefire-plugin</artifactId>
+		        <configuration>
+		          <useUIHarness>false</useUIHarness>
+				  <work>robochart-tests/</work>
+		        </configuration>
+		    </plugin>-->
 			<?ignore
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>target-platform-configuration</artifactId>
 				<configuration>
+					<work>robochart-tests</work>
 					<dependency-resolution>
 						<extraRequirements>
 							<!-- workaround for missing javax.annotation in tycho version
diff --git a/circus.robocalc.robochart.textual.tests/robochart-tests b/circus.robocalc.robochart.textual.tests/robochart-tests
index 0f9a612..b77c301 160000
--- a/circus.robocalc.robochart.textual.tests/robochart-tests
+++ b/circus.robocalc.robochart.textual.tests/robochart-tests
@@ -1 +1 @@
-Subproject commit 0f9a61237a76176e9d02725de906bf2808c0d522
+Subproject commit b77c3013a1eb5883db3614208a56a6c30bbe7549
diff --git a/circus.robocalc.robochart.textual.tests/src/circus/robocalc/robochart/textual/tests/IntegrationTest.xtend b/circus.robocalc.robochart.textual.tests/src/circus/robocalc/robochart/textual/tests/IntegrationTest.xtend
index a0e11cd..bd12ff3 100755
--- a/circus.robocalc.robochart.textual.tests/src/circus/robocalc/robochart/textual/tests/IntegrationTest.xtend
+++ b/circus.robocalc.robochart.textual.tests/src/circus/robocalc/robochart/textual/tests/IntegrationTest.xtend
@@ -44,274 +44,276 @@ class IntegrationTest {
 //	@Inject ParseHelper<RCPackage> parseHelper
 	@Inject extension SmartParserHelper<BasicPackage>
 	@Inject extension ValidationTestHelper
+	
+	val top_dir = "robochart-tests/"
 
 	@Test
 	def void AlphaAlgorithm() {
-		val dir = "robochart-tests/AlphaAlgorithm"
+		val dir = top_dir+"robochart/AlphaAlgorithm"
 		TestRoboChartModel(dir)
 	}
 
 	@Test
 	def void AsyncBuffers() {
-		val dir = "robochart-tests/AsyncBuffers"
+		val dir = top_dir+"robochart/AsyncBuffers"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void AutonomousChemicalDetector() {
-		val dir = "robochart-tests/AutonomousChemicalDetector"
+		val dir = top_dir+"robochart/AutonomousChemicalDetector"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void ChemicalDetector() {
-		val dir = "robochart-tests/ChemicalDetector"
+		val dir = top_dir+"robochart/ChemicalDetector"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void clocks0() {
-		val dir = "robochart-tests/clocks0"
+		val dir = top_dir+"robochart/clocks0"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void clocks1() {
-		val dir = "robochart-tests/clocks1"
+		val dir = top_dir+"robochart/clocks1"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void clocks2() {
-		val dir = "robochart-tests/clocks2"
+		val dir = top_dir+"robochart/clocks2"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void clocks3() {
-		val dir = "robochart-tests/clocks3"
+		val dir = top_dir+"robochart/clocks3"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void clocks4() {
-		val dir = "robochart-tests/clocks4-required"
+		val dir = top_dir+"robochart/clocks4-required"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void clocks5() {
-		val dir = "robochart-tests/clocks5"
+		val dir = top_dir+"robochart/clocks5"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void clocks6() {
-		val dir = "robochart-tests/clocks6"
+		val dir = top_dir+"robochart/clocks6"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void clocks7() {
-		val dir = "robochart-tests/clocks7"
+		val dir = top_dir+"robochart/clocks7"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void clocks8() {
-		val dir = "robochart-tests/clocks8"
+		val dir = top_dir+"robochart/clocks8"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void clock_wait_op() {
-		val dir = "robochart-tests/clock-wait-op"
+		val dir = top_dir+"robochart/clock-wait-op"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void const_ref() {
-		val dir = "robochart-tests/const_ref"
+		val dir = top_dir+"robochart/const_ref"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void const1() {
-		val dir = "robochart-tests/const1"
+		val dir = top_dir+"robochart/const1"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void DuringAndDeadline() {
-		val dir = "robochart-tests/DuringAndDeadline"
+		val dir = top_dir+"robochart/DuringAndDeadline"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void DuringAndDeadline2() {
-		val dir = "robochart-tests/DuringAndDeadline2"
+		val dir = top_dir+"robochart/DuringAndDeadline2"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void Example1() {
-		val dir = "robochart-tests/Example1"
+		val dir = top_dir+"robochart/Example1"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void Example2() {
-		val dir = "robochart-tests/Example2"
+		val dir = top_dir+"robochart/Example2"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void Example3() {
-		val dir = "robochart-tests/Example3"
+		val dir = top_dir+"robochart/Example3"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void multi_final_state() {
-		val dir = "robochart-tests/multi_final_state"
+		val dir = top_dir+"robochart/multi_final_state"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void ops1() {
-		val dir = "robochart-tests/ops1"
+		val dir = top_dir+"robochart/ops1"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void ops2() {
-		val dir = "robochart-tests/ops2"
+		val dir = top_dir+"robochart/ops2"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void refsem() {
-		val dir = "robochart-tests/refsem"
+		val dir = top_dir+"robochart/refsem"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void SequenceAndProductTest() {
-		val dir = "robochart-tests/SequenceAndProductTest"
+		val dir = top_dir+"robochart/SequenceAndProductTest"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void set1() {
-		val dir = "robochart-tests/set1"
+		val dir = top_dir+"robochart/set1"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void simGeneric1() {
-		val dir = "robochart-tests/simGeneric-1"
+		val dir = top_dir+"robochart/simGeneric-1"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void simGeneric5() {
-		val dir = "robochart-tests/simGeneric-5"
+		val dir = top_dir+"robochart/simGeneric-5"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void simGeneric8() {
-		val dir = "robochart-tests/simGeneric-8"
+		val dir = top_dir+"robochart/simGeneric-8"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void test1() {
-		val dir = "robochart-tests/test1"
+		val dir = top_dir+"robochart/test1"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void test2() {
-		val dir = "robochart-tests/test2"
+		val dir = top_dir+"robochart/test2"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void test3() {
-		val dir = "robochart-tests/test3"
+		val dir = top_dir+"robochart/test3"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void test4() {
-		val dir = "robochart-tests/test4"
+		val dir = top_dir+"robochart/test4"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void test5() {
-		val dir = "robochart-tests/test5"
+		val dir = top_dir+"robochart/test5"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void test6() {
-		val dir = "robochart-tests/test6"
+		val dir = top_dir+"robochart/test6"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void test7() {
-		val dir = "robochart-tests/test7"
+		val dir = top_dir+"robochart/test7"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void test8() {
-		val dir = "robochart-tests/test8"
+		val dir = top_dir+"robochart/test8"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void test9() {
-		val dir = "robochart-tests/test9"
+		val dir = top_dir+"robochart/test9"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void test10() {
-		val dir = "robochart-tests/test10"
+		val dir = top_dir+"robochart/test10"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void test11() {
-		val dir = "robochart-tests/test11"
+		val dir = top_dir+"robochart/test11"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void test12() {
-		val dir = "robochart-tests/test12"
+		val dir = top_dir+"robochart/test12"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void test13() {
-		val dir = "robochart-tests/test13"
+		val dir = top_dir+"robochart/test13"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void test14() {
-		val dir = "robochart-tests/test14"
+		val dir = top_dir+"robochart/test14"
 		TestRoboChartModel(dir)
 	}
 	
 	@Test
 	def void operationInputTest() {
-		val dir = "robochart-tests/robochart-fail/operationInput"
+		val dir = top_dir+"robochart-fail/operationInput"
 		val file = "operationInput.rct"
 		val errorMessage = "inputEvent on OperationInputSTM is used as the end of a unidirectional connection, but OperationInputSTM outputs on inputEvent via the operation Op"
 		TestRoboChartModelError(dir, file, Literals.CONNECTION, errorMessage)
@@ -319,7 +321,7 @@ class IntegrationTest {
 	
 	@Test
 	def void operationInputOpRefTest() {
-		val dir = "robochart-tests/robochart-fail/operationInputOpRef"
+		val dir = top_dir+"robochart-fail/operationInputOpRef"
 		val file = "operationInputOpRef.rct"
 		val errorMessage = "inputEvent on OperationInputSTM is used as the end of a unidirectional connection, but OperationInputSTM outputs on inputEvent via the operation Op"
 		TestRoboChartModelError(dir, file, Literals.CONNECTION, errorMessage)
@@ -327,7 +329,7 @@ class IntegrationTest {
 	
 	@Test
 	def void operationInputStmRefTest() {
-		val dir = "robochart-tests/robochart-fail/operationInputStmRef"
+		val dir = top_dir+"robochart-fail/operationInputStmRef"
 		val file = "operationInputStmRef.rct"
 		val errorMessage = "inputEvent on OperationInputSTM is used as the end of a unidirectional connection, but OperationInputSTM outputs on inputEvent via the operation Op"
 		TestRoboChartModelError(dir, file, Literals.CONNECTION, errorMessage)
@@ -335,7 +337,7 @@ class IntegrationTest {
 
 	@Test
 	def void operationOutputTest() {
-		val dir = "robochart-tests/robochart-fail/operationOutput"
+		val dir = top_dir+"robochart-fail/operationOutput"
 		val file = "operationOutput.rct"
 		val errorMessage = "outputEvent on OperationOutputSTM is used as the start of a unidirectional connection, but OperationOutputSTM receives input on outputEvent via the operation Op"
 		TestRoboChartModelError(dir, file, Literals.CONNECTION, errorMessage)
@@ -343,7 +345,7 @@ class IntegrationTest {
 	
 	@Test
 	def void operationOutputOpRefTest() {
-		val dir = "robochart-tests/robochart-fail/operationOutputOpRef"
+		val dir = top_dir+"robochart-fail/operationOutputOpRef"
 		val file = "operationOutputOpRef.rct"
 		val errorMessage = "outputEvent on OperationOutputSTM is used as the start of a unidirectional connection, but OperationOutputSTM receives input on outputEvent via the operation Op"
 		TestRoboChartModelError(dir, file, Literals.CONNECTION, errorMessage)
@@ -351,11 +353,21 @@ class IntegrationTest {
 	
 	@Test
 	def void operationOutputStmRefTest() {
-		val dir = "robochart-tests/robochart-fail/operationOutputStmRef"
+		val dir = top_dir+"robochart-fail/operationOutputStmRef"
 		val file = "operationOutputStmRef.rct"
 		val errorMessage = "outputEvent on OperationOutputSTM is used as the start of a unidirectional connection, but OperationOutputSTM receives input on outputEvent via the operation Op"
 		TestRoboChartModelError(dir, file, Literals.CONNECTION, errorMessage)
 	}
+	
+	@Test
+	def void transitionsOutsideNodeContainer() {
+		val dir = top_dir+"robochart-fail/transitionsOutsideNodeContainer"
+		val file = "main.rct"
+		val errorMessage1 = "Couldn't resolve reference to Node 'S0'."
+		val errorMessage2 = "Couldn't resolve reference to Node 'S3'."
+		TestRoboChartModelError(dir, file, Literals.TRANSITION, "org.eclipse.xtext.diagnostics.Diagnostic.Linking", errorMessage1)
+		TestRoboChartModelError(dir, file, Literals.TRANSITION, "org.eclipse.xtext.diagnostics.Diagnostic.Linking", errorMessage2)
+	}	
 
 	// This is not ideal as the errors trace back to this function instead of the test that failed.
 	// TODO: check why resolveAll is needed here and why it duplicates the library files (We add them as file:/ and the resolver adds them as platform:/
@@ -376,17 +388,18 @@ class IntegrationTest {
 		System.out.println("\n")
 	}
 
-	def File getFile(String path) {
-		val project_path = Paths.get(this.class.protectionDomain.codeSource.location.path).parent.parent
-		val p = project_path.resolve(path)
-		p.toFile
-	}
+//	def File getFile(String path) {
+//		val project_path = Paths.get(this.class.protectionDomain.codeSource.location.path).parent.parent
+//		val p = project_path.resolve(path)
+//		p.toFile
+//	}
 
 	def loadTestFiles(String path) {
 		val rs = createResourceSet()
 		// This assumes that the class loader points to the folder target/classes
-		val project_path = Paths.get(this.class.protectionDomain.codeSource.location.path).parent.parent
-		val dir = project_path.resolve(path)
+//		val project_path = Paths.get(this.class.protectionDomain.codeSource.location.path) //.parent.parent
+//		val dir = project_path.resolve(path)
+		val dir = Paths.get(path)
 
 		var Stream<Path> walk = Files.list(dir);
 		for (var Iterator<Path> it = walk.iterator(); it.hasNext();) {
@@ -414,4 +427,17 @@ class IntegrationTest {
 		}
 		System.out.println("\n")
 	}
+	
+	def void TestRoboChartModelError(String dir, String filename, EClass element, String code, String ... errorDescription) {
+		val rs = loadTestFiles(dir)
+		EcoreUtil.resolveAll(rs)
+		System.out.println("")
+		for (r: rs.resources) {
+			val rname = r.URI
+			if (rname.lastSegment !== null && rname.lastSegment.equals(filename)) {
+				r.assertError(element, code, errorDescription)
+			}
+		}
+		System.out.println("\n")
+	}
 }
diff --git a/circus.robocalc.robochart.textual.tests/src/circus/robocalc/robochart/textual/tests/SmartParserHelper.xtend b/circus.robocalc.robochart.textual.tests/src/circus/robocalc/robochart/textual/tests/SmartParserHelper.xtend
index 3044ec5..f7c1d6e 100644
--- a/circus.robocalc.robochart.textual.tests/src/circus/robocalc/robochart/textual/tests/SmartParserHelper.xtend
+++ b/circus.robocalc.robochart.textual.tests/src/circus/robocalc/robochart/textual/tests/SmartParserHelper.xtend
@@ -22,6 +22,7 @@ import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.emf.ecore.resource.ResourceSet
 import org.eclipse.xtext.resource.XtextResourceSet
 import org.eclipse.xtext.testing.util.ParseHelper
+import org.eclipse.core.runtime.FileLocator
 
 /*
  * code based on answer by Christian Dietrich in https://www.eclipse.org/forums/index.php/t/1068376/
@@ -54,6 +55,8 @@ class SmartParserHelper<T extends EObject> extends ParseHelper<T> {
 			if (url === null) {
 				url = classLoader.getResource("robochart");
 			}
+			
+			url = FileLocator.toFileURL(url);
 			val path = Paths.get(url.toURI)
 			var Stream<Path> walk = Files.list(path);
 			for (var Iterator<Path> it = walk.iterator(); it.hasNext();) {
diff --git a/circus.robocalc.robochart.textual/src/circus/robocalc/robochart/textual/scoping/RoboChartScopeProvider.xtend b/circus.robocalc.robochart.textual/src/circus/robocalc/robochart/textual/scoping/RoboChartScopeProvider.xtend
index 4d2a463..db3d6f9 100644
--- a/circus.robocalc.robochart.textual/src/circus/robocalc/robochart/textual/scoping/RoboChartScopeProvider.xtend
+++ b/circus.robocalc.robochart.textual/src/circus/robocalc/robochart/textual/scoping/RoboChartScopeProvider.xtend
@@ -227,7 +227,7 @@ class RoboChartScopeProvider extends AbstractRoboChartScopeProvider {
 				return scope
 			}
 		} else if (context instanceof Transition) {
-			val r = delegateGetScope(context, reference)
+			val r = IScope::NULLSCOPE
 			if (reference === TRANSITION__SOURCE) {
 				if (context.eContainer instanceof NodeContainer) {
 					return Scopes.scopeFor(