diff --git a/wetb/utils/test_files.py b/wetb/utils/test_files.py
index 6b21943720f96a10a32a96c74157af26e105409a..6e230c3fe903baf6e51a12f3e53971a42ea4d6f1 100644
--- a/wetb/utils/test_files.py
+++ b/wetb/utils/test_files.py
@@ -8,12 +8,17 @@ import wetb
 import inspect
 wetb_rep_path = os.path.join(os.path.dirname(wetb.__file__), "../")                                   
 
-def get_test_file(filename):
+
+def _absolute_filename(filename):
     if not os.path.isabs(filename):
-        index = [os.path.realpath(s[1]) for s in inspect.stack()].index(__file__) + 1
-        tfp = os.path.dirname(inspect.stack()[index][1]) + "/test_files/"
+        index = [os.path.realpath(s[1]) for s in inspect.stack()].index(__file__) + 2
+        caller_module_path = os.path.dirname(inspect.stack()[index][1])
+        tfp = caller_module_path + "/test_files/"
         filename = tfp + filename
-    
+    return filename
+
+def get_test_file(filename):
+    filename = _absolute_filename(filename) 
     if os.path.exists(filename):
         return filename
     else:
@@ -23,6 +28,8 @@ def get_test_file(filename):
 
 
 def move2test_files(filename):
+    filename = _absolute_filename(filename)
+    assert os.path.isfile(filename), filename
     dst_filename = os.path.join(wetb_rep_path, 'TestFiles', os.path.relpath(filename, wetb_rep_path))
     folder = os.path.dirname(dst_filename)
     if not os.path.exists(folder):
diff --git a/wetb/utils/tests/test_test_files.py b/wetb/utils/tests/test_test_files.py
index 655cf216738357ef89a395827ca2b1fdd7a79062..bba8267602f8796a0d132f7f84cf821fddafa7e4 100644
--- a/wetb/utils/tests/test_test_files.py
+++ b/wetb/utils/tests/test_test_files.py
@@ -27,7 +27,7 @@ class Test_test_files(unittest.TestCase):
         fn1 = get_test_file(tfp+'test_file.txt')
         self.assertTrue(fn1)
         fn2 = get_test_file('test_file.txt')
-        self.assertEqual(fn2, fn1)
+        self.assertEqual(fn1, fn2)