diff --git a/script/test/TestManipulatorScan.py b/script/test/TestManipulatorScan.py
index e66d8907..639ab5c5 100644
--- a/script/test/TestManipulatorScan.py
+++ b/script/test/TestManipulatorScan.py
@@ -8,15 +8,25 @@ STEPS (int or tuple)
 LATENCY (double)
 RELATIVE (BOOLEAN)
 """
-                                       
-#set_preference(Preference.PLOT_TYPES,{'ImageIntegrator':1})
+
+MOTOR = dummy
+SENSORS = (Counts, Scienta.spectrum, SampleCurrent, RefCurrent, MachineCurrent, EnergyDistribution, AngleDistribution)
+RANGE = (0.0, 1.0)
+STEPS = 10
+LATENCY=0.0
+RELATIVE = True
+
+
 adjust_sensors()
-set_adc_averaging()
 set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1})
 
-try:
-    lscan(MOTOR, SENSORS, RANGE[0], RANGE[1], STEPS, LATENCY, RELATIVE, before_read=before_readout, after_read = after_readout)
-finally:
-    if ENDSCAN:
-        after_scan()    
-    
\ No newline at end of file
+def _before():
+    trig_scienta()
+
+def _after(rec):
+  if get_exec_pars().save:
+      if rec.index == 0:              
+          create_diag_datasets()
+      append_diag_datasets()
+      
+lscan(MOTOR, SENSORS, RANGE[0], RANGE[1], STEPS, LATENCY, RELATIVE, before_read=_before, after_read = _after, name="test")