diff --git a/EddyHigh_b_Test/feedsRun b/EddyHigh_b_Test/feedsRun
index ee99d991aad1c622eb3c792f07491f6a3c739fe0..552c8cf106e0aba8e6a284a66711920f6eb75945 100755
--- a/EddyHigh_b_Test/feedsRun
+++ b/EddyHigh_b_Test/feedsRun
@@ -13,8 +13,7 @@
 #
 
 odir=$1
-strict=$2
-indir=$3
+indir=$2
 #
 # Inputs 1--3 are the once neccessary for feeds to work
 # Additional inputs are optional and intended for testing
@@ -57,10 +56,10 @@ for cuda_exe in ${exedir}/eddy_cuda*;
 do
     tmp=`basename $cuda_exe`
     version=`echo $tmp | sed 's/eddy_cuda//'`
-    cuda_jid="$cuda_jid `fsl_sub -q cuda.q ${cuda_exe} --imain=${indir}/EddyHigh_b_TestData/eddyData/testData --mask=${indir}/EddyHigh_b_TestData/eddyData/testMask --bvals=${indir}/EddyHigh_b_TestData/eddyData/testBvals --bvecs=${indir}/EddyHigh_b_TestData/eddyData/testBvecs --index=${indir}/EddyHigh_b_TestData/eddyData/testIndex --acqp=${indir}/EddyHigh_b_TestData/eddyData/testAcqparams --topup=${indir}/EddyHigh_b_TestData/eddyData/testTopup --nvoxhp=5000 --repol --fwhm=10,0,0,0,0 --dont_peas --out=${odir}/eddyCudaOutput${version} --very_verbose`"
+    cuda_jid="$cuda_jid `fsl_sub -l ${odir} -q cuda.q ${cuda_exe} --imain=${indir}/EddyHigh_b_TestData/eddyData/testData --mask=${indir}/EddyHigh_b_TestData/eddyData/testMask --bvals=${indir}/EddyHigh_b_TestData/eddyData/testBvals --bvecs=${indir}/EddyHigh_b_TestData/eddyData/testBvecs --index=${indir}/EddyHigh_b_TestData/eddyData/testIndex --acqp=${indir}/EddyHigh_b_TestData/eddyData/testAcqparams --topup=${indir}/EddyHigh_b_TestData/eddyData/testTopup --nvoxhp=5000 --repol --fwhm=10,0,0,0,0 --dont_peas --out=${odir}/eddyCudaOutput${version} --very_verbose`"
 done
 
-omp_jid=`fsl_sub -q long.q -s openmp,6 ${exedir}/eddy_openmp --imain=${indir}/EddyHigh_b_TestData/eddyData/testData --mask=${indir}/EddyHigh_b_TestData/eddyData/testMask --bvals=${indir}/EddyHigh_b_TestData/eddyData/testBvals --bvecs=${indir}/EddyHigh_b_TestData/eddyData/testBvecs --index=${indir}/EddyHigh_b_TestData/eddyData/testIndex --acqp=${indir}/EddyHigh_b_TestData/eddyData/testAcqparams --topup=${indir}/EddyHigh_b_TestData/eddyData/testTopup --nvoxhp=5000 --repol --fwhm=10,0,0,0,0 --dont_peas --out=${odir}/eddyOmpOutput --very_verbose`
+omp_jid=`fsl_sub -l ${odir} -q long.q -s openmp,6 ${exedir}/eddy_openmp --imain=${indir}/EddyHigh_b_TestData/eddyData/testData --mask=${indir}/EddyHigh_b_TestData/eddyData/testMask --bvals=${indir}/EddyHigh_b_TestData/eddyData/testBvals --bvecs=${indir}/EddyHigh_b_TestData/eddyData/testBvecs --index=${indir}/EddyHigh_b_TestData/eddyData/testIndex --acqp=${indir}/EddyHigh_b_TestData/eddyData/testAcqparams --topup=${indir}/EddyHigh_b_TestData/eddyData/testTopup --nvoxhp=5000 --repol --fwhm=10,0,0,0,0 --dont_peas --out=${odir}/eddyOmpOutput --very_verbose`
 # Ensure that slots are being reserved on the queue
 qalter ${omp_jid} -R y
 
@@ -120,9 +119,9 @@ done
 omp_exit_status=$?
 
 if [ $cuda_exit_status -gt 0 ] || [ $omp_exit_status -gt 0 ]; then
+    echo "Test failed"
     exit 1
 else
+    echo "Test passed"
     exit 0
 fi
-
-
diff --git a/EddyHigh_b_Test/nohup.sh b/EddyHigh_b_Test/nohup.sh
deleted file mode 100755
index 480cedc24aaf57b8cf5ee7c43b458bc11194459c..0000000000000000000000000000000000000000
--- a/EddyHigh_b_Test/nohup.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-./feedsRun /vols/Data/fsldev/pyfeeds_results/EddyHigh_b blah /vols/Data/fsldev/dataSets /opt/fmrib/fsltmp/fsl_3b4d64ae/bin
-echo Final Status $?
diff --git a/EddyLSRTest/feedsRun b/EddyLSRTest/feedsRun
index a2db1ee828df37710cd6d6cddb7352ce64eadf49..e7672ee71da02e649e361f976ea394e0310e079c 100755
--- a/EddyLSRTest/feedsRun
+++ b/EddyLSRTest/feedsRun
@@ -10,8 +10,7 @@
 #
 
 odir=$1
-strict=$2
-indir=$3
+indir=$2
 #
 # Inputs 1--3 are the once neccessary for feeds to work
 # Additional inputs are optional and intended for testing
@@ -54,10 +53,10 @@ for cuda_exe in ${exedir}/eddy_cuda*;
 do
     tmp=`basename $cuda_exe`
     version=`echo $tmp | sed 's/eddy_cuda//'`
-    cuda_jid="$cuda_jid `fsl_sub -q cuda.q ${cuda_exe} --imain=${indir}/EddyLSRTestData/eddyData/testData --mask=${indir}/EddyLSRTestData/eddyData/testMask --bvals=${indir}/EddyLSRTestData/eddyData/testBvals --bvecs=${indir}/EddyLSRTestData/eddyData/testBvecs --index=${indir}/EddyLSRTestData/eddyData/testIndex --acqp=${indir}/EddyLSRTestData/eddyData/testAcqparams --topup=${indir}/EddyLSRTestData/eddyData/testTopup --out=${odir}/eddyCudaOutput${version} --resamp=lsr --fep --nvoxhp=5000 --repol --fwhm=10,0,0,0,0 --dont_peas --very_verbose`"
+    cuda_jid="$cuda_jid `fsl_sub -l ${odir} -q cuda.q ${cuda_exe} --imain=${indir}/EddyLSRTestData/eddyData/testData --mask=${indir}/EddyLSRTestData/eddyData/testMask --bvals=${indir}/EddyLSRTestData/eddyData/testBvals --bvecs=${indir}/EddyLSRTestData/eddyData/testBvecs --index=${indir}/EddyLSRTestData/eddyData/testIndex --acqp=${indir}/EddyLSRTestData/eddyData/testAcqparams --topup=${indir}/EddyLSRTestData/eddyData/testTopup --out=${odir}/eddyCudaOutput${version} --resamp=lsr --fep --nvoxhp=5000 --repol --fwhm=10,0,0,0,0 --dont_peas --very_verbose`"
 done
 
-omp_jid=`fsl_sub -q long.q -s openmp,6 ${exedir}/eddy_openmp --imain=${indir}/EddyLSRTestData/eddyData/testData --mask=${indir}/EddyLSRTestData/eddyData/testMask --bvals=${indir}/EddyLSRTestData/eddyData/testBvals --bvecs=${indir}/EddyLSRTestData/eddyData/testBvecs --index=${indir}/EddyLSRTestData/eddyData/testIndex --acqp=${indir}/EddyLSRTestData/eddyData/testAcqparams --topup=${indir}/EddyLSRTestData/eddyData/testTopup --out=${odir}/eddyOmpOutput --resamp=lsr --fep --nvoxhp=5000 --repol --fwhm=10,0,0,0,0 --dont_peas --very_verbose`
+omp_jid=`fsl_sub -l ${odir} -q long.q -s openmp,6 ${exedir}/eddy_openmp --imain=${indir}/EddyLSRTestData/eddyData/testData --mask=${indir}/EddyLSRTestData/eddyData/testMask --bvals=${indir}/EddyLSRTestData/eddyData/testBvals --bvecs=${indir}/EddyLSRTestData/eddyData/testBvecs --index=${indir}/EddyLSRTestData/eddyData/testIndex --acqp=${indir}/EddyLSRTestData/eddyData/testAcqparams --topup=${indir}/EddyLSRTestData/eddyData/testTopup --out=${odir}/eddyOmpOutput --resamp=lsr --fep --nvoxhp=5000 --repol --fwhm=10,0,0,0,0 --dont_peas --very_verbose`
 # Ensure that slots are being reserved on the queue
 qalter ${omp_jid} -R y
 
@@ -117,9 +116,9 @@ done
 omp_exit_status=$?
 
 if [ $cuda_exit_status -gt 0 ] || [ $omp_exit_status -gt 0 ]; then
+    echo "Test failed"
     exit 1
 else
+    echo "Test passed"
     exit 0
 fi
-
-
diff --git a/EddyLSRTest/nohup.sh b/EddyLSRTest/nohup.sh
deleted file mode 100755
index 447f22f314d3a2d0e972ab3e890ae1b053b41d47..0000000000000000000000000000000000000000
--- a/EddyLSRTest/nohup.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-./feedsRun /vols/Data/fsldev/pyfeeds_results/EddyLSRTest blah /vols/Data/fsldev/dataSets /opt/fmrib/fsltmp/fsl_3b4d64ae/bin
-echo Final Status $?
diff --git a/EddyMBSTest/feedsRun b/EddyMBSTest/feedsRun
index 063b61093aae1e4dbc3403cd3da60365705c006e..b58157a3fa9b544294a8d65d79e32ccf305bc6c5 100755
--- a/EddyMBSTest/feedsRun
+++ b/EddyMBSTest/feedsRun
@@ -15,8 +15,7 @@
 #
 
 odir=$1
-strict=$2
-indir=$3
+indir=$2
 #
 # Inputs 1--3 are the once neccessary for feeds to work
 # Additional inputs are optional and intended for testing
@@ -66,10 +65,10 @@ for cuda_exe in ${exedir}/eddy_cuda*;
 do
     tmp=`basename $cuda_exe`
     version=`echo $tmp | sed 's/eddy_cuda//'`
-    cuda_jid="$cuda_jid `fsl_sub -q cuda.q ${cuda_exe} --imain=${indir}/EddyMBSTestData/eddyData/testData --acqp=${indir}/EddyMBSTestData/eddyData/testAcqparams --mask=${indir}/EddyMBSTestData/eddyData/testMask --index=${indir}/EddyMBSTestData/eddyData/testIndex --bvecs=${indir}/EddyMBSTestData/eddyData/testBvecs --bvals=${indir}/EddyMBSTestData/eddyData/testBvals --topup=${indir}/EddyMBSTestData/eddyData/testTopup --fwhm=10,5,2,0,0,0,0,0 --niter=8 --nvoxhp=2000 --flm=quadratic --dont_peas --estimate_move_by_susceptibility --mbs_niter=20 --mbs_lambda=10 --mbs_ksp=10 --out=${odir}/eddyCudaOutput${version} --very_verbose`"
+    cuda_jid="$cuda_jid `fsl_sub -l ${odir} -q cuda.q ${cuda_exe} --imain=${indir}/EddyMBSTestData/eddyData/testData --acqp=${indir}/EddyMBSTestData/eddyData/testAcqparams --mask=${indir}/EddyMBSTestData/eddyData/testMask --index=${indir}/EddyMBSTestData/eddyData/testIndex --bvecs=${indir}/EddyMBSTestData/eddyData/testBvecs --bvals=${indir}/EddyMBSTestData/eddyData/testBvals --topup=${indir}/EddyMBSTestData/eddyData/testTopup --fwhm=10,5,2,0,0,0,0,0 --niter=8 --nvoxhp=2000 --flm=quadratic --dont_peas --estimate_move_by_susceptibility --mbs_niter=20 --mbs_lambda=10 --mbs_ksp=10 --out=${odir}/eddyCudaOutput${version} --very_verbose`"
 done
 
-omp_jid=`fsl_sub -q long.q -s openmp,6 ${exedir}/eddy_openmp --imain=${indir}/EddyMBSTestData/eddyData/testData --acqp=${indir}/EddyMBSTestData/eddyData/testAcqparams --mask=${indir}/EddyMBSTestData/eddyData/testMask --index=${indir}/EddyMBSTestData/eddyData/testIndex --bvecs=${indir}/EddyMBSTestData/eddyData/testBvecs --bvals=${indir}/EddyMBSTestData/eddyData/testBvals --topup=${indir}/EddyMBSTestData/eddyData/testTopup --fwhm=10,5,2,0,0,0,0,0 --niter=8 --nvoxhp=2000 --flm=quadratic --dont_peas --estimate_move_by_susceptibility --mbs_niter=20 --mbs_lambda=10 --mbs_ksp=10 --out=${odir}/eddyOmpOutput --very_verbose`
+omp_jid=`fsl_sub -l ${odir} -q long.q -s openmp,6 ${exedir}/eddy_openmp --imain=${indir}/EddyMBSTestData/eddyData/testData --acqp=${indir}/EddyMBSTestData/eddyData/testAcqparams --mask=${indir}/EddyMBSTestData/eddyData/testMask --index=${indir}/EddyMBSTestData/eddyData/testIndex --bvecs=${indir}/EddyMBSTestData/eddyData/testBvecs --bvals=${indir}/EddyMBSTestData/eddyData/testBvals --topup=${indir}/EddyMBSTestData/eddyData/testTopup --fwhm=10,5,2,0,0,0,0,0 --niter=8 --nvoxhp=2000 --flm=quadratic --dont_peas --estimate_move_by_susceptibility --mbs_niter=20 --mbs_lambda=10 --mbs_ksp=10 --out=${odir}/eddyOmpOutput --very_verbose`
 # Ensure that slots are being reserved on the queue
 qalter ${omp_jid} -R y
 
@@ -124,8 +123,9 @@ done
 omp_exit_status=$?
 
 if [ $cuda_exit_status -gt 0 ] || [ $omp_exit_status -gt 0 ]; then
+    echo "Test failed"
     exit 1
 else
+    echo "Test passed"
     exit 0
 fi
-
diff --git a/EddyMBSTest/nohup.sh b/EddyMBSTest/nohup.sh
deleted file mode 100755
index c4985c16fd0e7589a825e1669a57ca1e695e2460..0000000000000000000000000000000000000000
--- a/EddyMBSTest/nohup.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-./feedsRun /vols/Data/fsldev/pyfeeds_results/EddyMBSTest blah /vols/Data/fsldev/dataSets /opt/fmrib/fsltmp/fsl_3b4d64ae/bin
-echo Final Status $?
diff --git a/EddyS2VTest/feedsRun b/EddyS2VTest/feedsRun
index f6d8a39fce51af125e0969d270f8e567221d98e1..e169ca1ffc5257c66c69632b16376c67ae4f5817 100755
--- a/EddyS2VTest/feedsRun
+++ b/EddyS2VTest/feedsRun
@@ -13,8 +13,7 @@
 #
 
 odir=$1
-strict=$2
-indir=$3
+indir=$2
 #
 # Inputs 1--3 are the ones neccessary for feeds to work
 # Additional inputs are optional and intended for testing
@@ -57,7 +56,7 @@ for cuda_exe in ${exedir}/eddy_cuda*;
 do
     tmp=`basename $cuda_exe`
     version=`echo $tmp | sed 's/eddy_cuda//'`
-    cuda_jid=`fsl_sub -q cuda.q ${cuda_exe} --imain=${indir}/EddyS2VTestData/eddyData/testData --mask=${indir}/EddyS2VTestData/eddyData/testMask --bvals=${indir}/EddyS2VTestData/eddyData/testBvals --bvecs=${indir}/EddyS2VTestData/eddyData/testBvecs --index=${indir}/EddyS2VTestData/eddyData/testIndex --acqp=${indir}/EddyS2VTestData/eddyData/testAcqparams --repol --ol_type=slice --ol_nstd=6 --ol_nvox=500 --niter=8 --fwhm=10,6,4,2,0,0,0,0 --out=${odir}/eddyCudaOutput${version} --nvoxhp=5000 --mporder=16 --s2v_niter=10 --s2v_interp=trilinear --s2v_lambda=1 --slspec=${indir}/EddyS2VTestData/eddyData/testSlspec --very_verbose`
+    cuda_jid=`fsl_sub -l ${odir} -q cuda.q ${cuda_exe} --imain=${indir}/EddyS2VTestData/eddyData/testData --mask=${indir}/EddyS2VTestData/eddyData/testMask --bvals=${indir}/EddyS2VTestData/eddyData/testBvals --bvecs=${indir}/EddyS2VTestData/eddyData/testBvecs --index=${indir}/EddyS2VTestData/eddyData/testIndex --acqp=${indir}/EddyS2VTestData/eddyData/testAcqparams --repol --ol_type=slice --ol_nstd=6 --ol_nvox=500 --niter=8 --fwhm=10,6,4,2,0,0,0,0 --out=${odir}/eddyCudaOutput${version} --nvoxhp=5000 --mporder=16 --s2v_niter=10 --s2v_interp=trilinear --s2v_lambda=1 --slspec=${indir}/EddyS2VTestData/eddyData/testSlspec --very_verbose`
 done
 
 # omp_jid=`fsl_sub -q long.q -s openmp,6 ${exedir}/eddy_openmp --imain=${indir}/EddyS2VTestData/eddyData/testData --mask=${indir}/EddyS2VTestData/eddyData/testMask --bvals=${indir}/EddyS2VTestData/eddyData/testBvals --bvecs=${indir}/EddyS2VTestData/eddyData/testBvecs --index=${indir}/EddyS2VTestData/eddyData/testIndex --acqp=${indir}/EddyS2VTestData/eddyData/testAcqparams --repol --ol_type=slice --ol_nstd=6 --niter=8 --fwhm=10,6,4,2,0,0,0,0 --out=${odir}/eddyOmpOutput --nvoxhp=5000 --mporder=16 --s2v_niter=10 --s2v_interp=trilinear --s2v_lambda=1 --slspec=${indir}/EddyS2VTestData/eddyData/testSlspec --very_verbose`
@@ -120,14 +119,19 @@ for cuda_exe in ${exedir}/eddy_cuda*;
 do
     tmp=`basename $cuda_exe`
     version=`echo $tmp | sed 's/eddy_cuda//'`
-    ./S2VFeeds.py ${odir} Cuda${version} `imglob -extension ${indir}/EddyTestData/eddyData/testMask` ${indir}/EddyS2VTestData/eddyData/testBvals `imglob -extension ${odir}/eddyCudaOutput${version}` `imglob -extension ${indir}/EddyS2VTestData/eddyData/GroundTruth/ground_truth` ${odir}/eddyCudaOutput${version}.eddy_movement_over_time ${indir}/EddyS2VTestData/eddyData/MovementTruth/ground_truth.eddy_movement_over_time ${odir}/eddyCudaOutput${version}.eddy_outlier_map ${indir}/EddyS2VTestData/eddyData/OutlierTruth/dropoutLog_1.txt ${max_ima_diff} ${max_false_pos} ${max_false_neg} ${max_trans_diff} ${max_rot_diff}   
+    echo "./S2VFeeds.py ${odir} Cuda${version} `imglob -extension ${indir}/EddyS2VTestData/eddyData/testMask` ${indir}/EddyS2VTestData/eddyData/testBvals `imglob -extension ${odir}/eddyCudaOutput${version}` `imglob -extension $\
+{indir}/EddyS2VTestData/eddyData/GroundTruth/ground_truth` ${odir}/eddyCudaOutput${version}.eddy_movement_over_time ${indir}/EddyS2VTestData/eddyData/MovementTruth/ground_truth.eddy_movement_over_time ${odir}/eddyCudaO\
+utput${version}.eddy_outlier_map ${indir}/EddyS2VTestData/eddyData/OutlierTruth/dropoutLog_1.txt ${max_ima_diff} ${max_false_pos} ${max_false_neg} ${max_trans_diff} ${max_rot_diff}"
+    ./S2VFeeds.py ${odir} Cuda${version} `imglob -extension ${indir}/EddyS2VTestData/eddyData/testMask` ${indir}/EddyS2VTestData/eddyData/testBvals `imglob -extension ${odir}/eddyCudaOutput${version}` `imglob -extension ${indir}/EddyS2VTestData/eddyData/GroundTruth/ground_truth` ${odir}/eddyCudaOutput${version}.eddy_movement_over_time ${indir}/EddyS2VTestData/eddyData/MovementTruth/ground_truth.eddy_movement_over_time ${odir}/eddyCudaOutput${version}.eddy_outlier_map ${indir}/EddyS2VTestData/eddyData/OutlierTruth/dropoutLog_1.txt ${max_ima_diff} ${max_false_pos} ${max_false_neg} ${max_trans_diff} ${max_rot_diff}   
     cuda_exit_status=$(($cuda_exit_status + $?))
 done
 
 omp_exit_status=0
 
 if [ $cuda_exit_status -gt 0 ] || [ $omp_exit_status -gt 0 ]; then
+    echo "Test failed"
     exit 1
 else
+    echo "Test passed"
     exit 0
 fi
diff --git a/EddyS2VTest/nohup.sh b/EddyS2VTest/nohup.sh
deleted file mode 100755
index 87acbcceb662cf559b1e795b60ff2ed04b3f4a3f..0000000000000000000000000000000000000000
--- a/EddyS2VTest/nohup.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-./feedsRun /vols/Data/fsldev/pyfeeds_results/EddyS2VTest blah /vols/Data/fsldev/dataSets /opt/fmrib/fsltmp/fsl_3b4d64ae/bin
-echo Final Status $?
diff --git a/EddyTest/feedsRun b/EddyTest/feedsRun
index d3a73061fff3a103c3907e5705abbc9f8e6b21ce..3fd56680cd8b57c536eb3210c97b6c03e74b85db 100755
--- a/EddyTest/feedsRun
+++ b/EddyTest/feedsRun
@@ -9,8 +9,7 @@
 #
 
 odir=$1
-strict=$2
-indir=$3
+indir=$2
 #
 # Inputs 1--3 are the once neccessary for feeds to work
 # Additional inputs are optional and intended for testing
@@ -62,10 +61,10 @@ for cuda_exe in ${exedir}/eddy_cuda*;
 do
     tmp=`basename $cuda_exe`
     version=`echo $tmp | sed 's/eddy_cuda//'`
-    cuda_jid="$cuda_jid `fsl_sub -q cuda.q ${cuda_exe} --imain=${indir}/EddyTestData/eddyData/testData --mask=${indir}/EddyTestData/eddyData/testMask --bvals=${indir}/EddyTestData/eddyData/testBvals --bvecs=${indir}/EddyTestData/eddyData/testBvecs --index=${indir}/EddyTestData/eddyData/testIndex --acqp=${indir}/EddyTestData/eddyData/testAcqparams --repol --fwhm=10,0,0,0,0 --out=${odir}/eddyCudaOutput${version} --dfields -v`"
+    cuda_jid="$cuda_jid `fsl_sub -l ${odir} -q cuda.q ${cuda_exe} --imain=${indir}/EddyTestData/eddyData/testData --mask=${indir}/EddyTestData/eddyData/testMask --bvals=${indir}/EddyTestData/eddyData/testBvals --bvecs=${indir}/EddyTestData/eddyData/testBvecs --index=${indir}/EddyTestData/eddyData/testIndex --acqp=${indir}/EddyTestData/eddyData/testAcqparams --repol --fwhm=10,0,0,0,0 --out=${odir}/eddyCudaOutput${version} --dfields -v`"
 done
 
-omp_jid=`fsl_sub -q long.q -s openmp,6 ${exedir}/eddy_openmp --imain=${indir}/EddyTestData/eddyData/testData --mask=${indir}/EddyTestData/eddyData/testMask --bvals=${indir}/EddyTestData/eddyData/testBvals --bvecs=${indir}/EddyTestData/eddyData/testBvecs --index=${indir}/EddyTestData/eddyData/testIndex --acqp=${indir}/EddyTestData/eddyData/testAcqparams --repol --fwhm=10,0,0,0,0 --out=${odir}/eddyOmpOutput --dfields -v`
+omp_jid=`fsl_sub -l ${odir} -q long.q -s openmp,6 ${exedir}/eddy_openmp --imain=${indir}/EddyTestData/eddyData/testData --mask=${indir}/EddyTestData/eddyData/testMask --bvals=${indir}/EddyTestData/eddyData/testBvals --bvecs=${indir}/EddyTestData/eddyData/testBvecs --index=${indir}/EddyTestData/eddyData/testIndex --acqp=${indir}/EddyTestData/eddyData/testAcqparams --repol --fwhm=10,0,0,0,0 --out=${odir}/eddyOmpOutput --dfields -v`
 # Ensure that slots are being reserved on the queue
 qalter ${omp_jid} -R y
 
@@ -120,9 +119,9 @@ done
 omp_exit_status=$?
 
 if [ $cuda_exit_status -gt 0 ] || [ $omp_exit_status -gt 0 ]; then
+    echo "Test failed"
     exit 1
 else
+    echo "Test passed"
     exit 0
 fi
-
-
diff --git a/EddyTest/nohup.sh b/EddyTest/nohup.sh
deleted file mode 100755
index a7b6766399cce63c3c778ed39fcbc7ac472595b7..0000000000000000000000000000000000000000
--- a/EddyTest/nohup.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-./feedsRun /vols/Data/fsldev/pyfeeds_results/EddyTestTaylor blah /vols/Data/fsldev/dataSets /opt/fmrib/fsltmp/fsl_3b4d64ae/bin
-echo Final Status $?
diff --git a/fsl_course/fdt2/feedsRun4.sh b/fsl_course/fdt2/feedsRun4.sh
index ec2e4bebf0a1ee989611335497f660b1e89d659e..942b6629463ad31f2a987c05fa05a0a66a9310f1 100755
--- a/fsl_course/fdt2/feedsRun4.sh
+++ b/fsl_course/fdt2/feedsRun4.sh
@@ -8,6 +8,8 @@ datadir=$2
 subdatadir=$datadir/fsl_course_data/fdt2
 
 # Run find_the_biggest
+
+export LC_COLLATE=C 
 find_the_biggest ${subdatadir}/subj1.bedpostX/THAL2CTX_right/seeds_to_* ${outdir}/biggest_segmentation
 
 exit 0
diff --git a/unit_tests/fslcreatehd/3d.nii.gz b/unit_tests/fslcreatehd/3d.nii.gz
deleted file mode 100644
index da78daafa58d09c981268f5ebfa3f2ac7aa2f6b1..0000000000000000000000000000000000000000
--- a/unit_tests/fslcreatehd/3d.nii.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:32f7028bd9a93f03fb6f8536396a04945070493b9b4fcf0fd015bb7859579b9a
-size 88
diff --git a/unit_tests/fslcreatehd/feedsRun b/unit_tests/fslcreatehd/feedsRun
index baec62b2f55087d5e7d3939597961d7e89712711..8563ff959cb3e7370fecba61439011b92a2e8a04 100755
--- a/unit_tests/fslcreatehd/feedsRun
+++ b/unit_tests/fslcreatehd/feedsRun
@@ -35,9 +35,9 @@ function fslcreatehd_test() {
 
     args="$dim0 $dim1 $dim2 $dim3 $pixdim1 $pixdim2 $pixdim3 $pixdim4 $originx  $originy  $originz $dtype $fname"
 
-    originx=`echo "($dim1 * $pixdim1) - (( $originx + 1) * $pixdim1)" | bc`
-    originy=`echo                        "-$originy      * $pixdim2"  | bc`
-    originz=`echo                        "-$originz      * $pixdim3"  | bc`
+    originx=`echo " $originx * $pixdim1" | bc`
+    originy=`echo "-$originy * $pixdim2"  | bc`
+    originz=`echo "-$originz * $pixdim3"  | bc`
 
     got_dim0=`   fslhd $fname | egrep "^dim0"      | tr -s '\t' | cut -f 2`
     got_dim1=`   fslhd $fname | egrep "^dim1"      | tr -s '\t' | cut -f 2`
diff --git a/unit_tests/fslcreatehd/feedsRun~ b/unit_tests/fslcreatehd/feedsRun~
deleted file mode 100644
index 1c4a9b5d12285ce6ee74af3f9fde28a835e67d6b..0000000000000000000000000000000000000000
--- a/unit_tests/fslcreatehd/feedsRun~
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -e
-
-fslcreatehd 5 5 5 5 0.5 1.5 1.25 0.7 1.5 2.5 3.5 2 header.nii.gz
-
-if [ `fslhd header.nii.gz | grep "pixdim1" != "