diff --git a/script/motion/unmount.py b/script/motion/unmount.py
index ebebf29..95b6512 100644
--- a/script/motion/unmount.py
+++ b/script/motion/unmount.py
@@ -35,7 +35,7 @@ def unmount(segment, puck, sample, force=False):
     try:
         robot.get_gonio()
         #TODO: Shuld check if smart magnet detection is off?
-        update_samples_info_sample_unmount(get_puck_name(segment, puck))      
+        update_samples_info_sample_unmount(get_puck_name(segment, puck), sample)      
         robot.move_dewar()        
         robot.put_dewar(segment, puck, sample)
     finally:
diff --git a/script/test/SampleDataInput.py b/script/test/SampleDataInput.py
new file mode 100644
index 0000000..15f9f1f
--- /dev/null
+++ b/script/test/SampleDataInput.py
@@ -0,0 +1,30 @@
+USER_NAME = "My User"
+DEWAR_NAME = "My Dewar"
+
+test_sample_data = [    \
+            {  "userName": USER_NAME, \  
+               "dewarName": DEWAR_NAME, \	
+               "puckName": "My puck", 	\
+               "puckBarcode": "AAA0001", \	
+               "puckType": "unipuck", 	\
+               "puckAddress": "",\ 	
+               "sampleName": "MySample 1", \	
+               "samplePosition": 1,\ 	
+               "sampleStatus": "Present", 	\
+               "sampleMountCount": 0,    
+               } , \
+            {  "userName": USER_NAME, \  
+               "dewarName": DEWAR_NAME, \	
+               "puckName": "My puck", 	\
+               "puckBarcode": "AAA0001", \	
+               "puckType": "unipuck", 	\
+               "puckAddress": "",\ 	
+               "sampleName": "MySample 2", \	
+               "samplePosition": 2,\ 	
+               "sampleStatus": "Present", 	\
+               "sampleMountCount": 0,    
+               } , \
+      ] 
+
+
+set_samples_info(test_sample_data)  
\ No newline at end of file