diff --git a/bin/core/imag-link/src/main.rs b/bin/core/imag-link/src/main.rs
index e0b55149..ab4a345e 100644
--- a/bin/core/imag-link/src/main.rs
+++ b/bin/core/imag-link/src/main.rs
@@ -397,7 +397,7 @@ mod tests {
     #[test]
     fn test_link_modificates() {
         setup_logging();
-        let rt = generate_test_runtime(vec!["internal", "test1", "test2"])
+        let rt = generate_test_runtime(vec!["test1", "test2"])
             .unwrap();
 
         debug!("Runtime created");
@@ -421,12 +421,14 @@ mod tests {
 
         assert_ne!(*test_links1, links_toml_value(vec![]));
         assert_ne!(*test_links2, links_toml_value(vec![]));
+
+        debug!("Test finished")
     }
 
     #[test]
     fn test_linking_links() {
         setup_logging();
-        let rt = generate_test_runtime(vec!["internal", "test1", "test2"])
+        let rt = generate_test_runtime(vec!["test1", "test2"])
             .unwrap();
 
         debug!("Runtime created");
@@ -455,7 +457,7 @@ mod tests {
     #[test]
     fn test_multilinking() {
         setup_logging();
-        let rt = generate_test_runtime(vec!["internal", "test1", "test2"])
+        let rt = generate_test_runtime(vec!["test1", "test2"])
             .unwrap();
 
         debug!("Runtime created");
@@ -485,7 +487,7 @@ mod tests {
     #[test]
     fn test_linking_more_than_two() {
         setup_logging();
-        let rt = generate_test_runtime(vec!["internal", "test1", "test2", "test3"])
+        let rt = generate_test_runtime(vec!["test1", "test2", "test3"])
             .unwrap();
 
         debug!("Runtime created");
@@ -522,7 +524,7 @@ mod tests {
     #[test]
     fn test_linking_links_unlinking_removes_links() {
         setup_logging();
-        let rt = generate_test_runtime(vec!["internal", "test1", "test2"])
+        let rt = generate_test_runtime(vec!["test1", "test2"])
             .unwrap();
 
         debug!("Runtime created");
@@ -558,7 +560,7 @@ mod tests {
     #[test]
     fn test_linking_and_unlinking_more_than_two() {
         setup_logging();
-        let rt = generate_test_runtime(vec!["internal", "test1", "test2", "test3"])
+        let rt = generate_test_runtime(vec!["test1", "test2", "test3"])
             .unwrap();
 
         debug!("Runtime created");
diff --git a/lib/etc/libimagutil/src/testing.rs b/lib/etc/libimagutil/src/testing.rs
index d15ab383..d9144d47 100644
--- a/lib/etc/libimagutil/src/testing.rs
+++ b/lib/etc/libimagutil/src/testing.rs
@@ -96,9 +96,9 @@ macro_rules! make_mock_app {
 
             #[allow(unused)]
             pub fn generate_test_runtime<'a>(mut args: Vec<&'static str>) -> Result<Runtime<'a>, Error> {
-                let mut cli_args = vec![$appname, "--rtp", "/tmp"];
-
+                let mut cli_args = vec![$appname];
                 cli_args.append(&mut args);
+                debug!("Generating test runtime with args = {:?}", cli_args);
 
                 let cli_app = MockLinkApp::new(cli_args);
                 Runtime::with_configuration(cli_app, generate_minimal_test_config())
@@ -108,9 +108,9 @@ macro_rules! make_mock_app {
             pub fn reset_test_runtime<'a>(mut args: Vec<&'static str>, old_runtime: Runtime)
                 -> Result<Runtime<'a>, Error>
             {
-                let mut cli_args = vec![$appname, "--rtp", "/tmp"];
-
+                let mut cli_args = vec![$appname];
                 cli_args.append(&mut args);
+                debug!("New arguments: {:?}", cli_args);
 
                 let cli_app = MockLinkApp::new(cli_args);
                 Runtime::with_configuration(cli_app, generate_minimal_test_config())