diff --git a/BayesValidRox/tests/PA-A/Benchmark_PAA.py b/BayesValidRox/tests/PA-A/Benchmark_PAA.py
index 728d334e2b239faea88e3875e8020df2977bccf5..6697bc361a52fff9090c8a1b28910621461d047c 100644
--- a/BayesValidRox/tests/PA-A/Benchmark_PAA.py
+++ b/BayesValidRox/tests/PA-A/Benchmark_PAA.py
@@ -33,18 +33,13 @@ plt.rc('legend', fontsize=SIZE)    # legend fontsize
 plt.rc('figure', titlesize=SIZE)  # fontsize of the figure title
 
 
-
 try:
     import cPickle as pickle
 except ModuleNotFoundError:
     import pickle
 
-# Anaconda
-#sys.path.insert(0,'./../../../../bayesian-validation/BayesValidRox')
-sys.path.insert(0,'./../bayesian-validation/BayesValidRox/')
-
-# Batch script
-# sys.path.insert(0,'./../../BayesValidRox')
+# Add BayesValidRox path
+sys.path.insert(0,'./../../../BayesValidRox/')
 
 
 # Import the scripts
diff --git a/BayesValidRox/tests/PA-A/ffpm_validation_stokesdarcy.py b/BayesValidRox/tests/PA-A/ffpm_validation_stokesdarcy.py
index 3f69e4cbe1b58270d115749957b701925e714a5b..d44983b9826d7e1ec70b087ba1f485c5b2f40b65 100755
--- a/BayesValidRox/tests/PA-A/ffpm_validation_stokesdarcy.py
+++ b/BayesValidRox/tests/PA-A/ffpm_validation_stokesdarcy.py
@@ -30,11 +30,9 @@ plt.rc('grid', linestyle="-")
 
 import matplotlib
 matplotlib.use('agg')
-# Local
-sys.path.insert(0,'./../bayesian-validation/BayesValidRox/')
 
-# Batch script
-# sys.path.insert(0,'./../../bayesian-validation/BayesValidRox/')
+# Add BayesValidRox path
+sys.path.insert(0,'./../../../BayesValidRox/')
 
 from PyLink.PyLinkForwardModel import PyLinkForwardModel
 from surrogate_models.Input import Input
diff --git a/BayesValidRox/tests/PA-A/ffpm_validation_stokespnm.py b/BayesValidRox/tests/PA-A/ffpm_validation_stokespnm.py
index f4d6e81b7be3c99e168b87dcc3857a2c06f392fd..ea1f0d7ef1987857c0887853248bb92520eeaf47 100755
--- a/BayesValidRox/tests/PA-A/ffpm_validation_stokespnm.py
+++ b/BayesValidRox/tests/PA-A/ffpm_validation_stokespnm.py
@@ -32,11 +32,8 @@ plt.rc('grid', linestyle="-")
 
 import matplotlib
 matplotlib.use('agg')
-# Local
-sys.path.insert(0,'./../bayesian-validation/BayesValidRox/')
-
-# Batch script
-# sys.path.insert(0,'./../../bayesian-validation/BayesValidRox/')
+# Add BayesValidRox path
+sys.path.insert(0,'./../../../BayesValidRox/')
 
 from PyLink.PyLinkForwardModel import PyLinkForwardModel
 from surrogate_models.Input import Input
diff --git a/BayesValidRox/tests/PA-A/ref_stokesdarcy.py b/BayesValidRox/tests/PA-A/ref_stokesdarcy.py
index 24e3ab042444f990c7e8eeca2659ff11e75fc084..bd1759bb845898e435fbf386b0896a6ab44369f1 100755
--- a/BayesValidRox/tests/PA-A/ref_stokesdarcy.py
+++ b/BayesValidRox/tests/PA-A/ref_stokesdarcy.py
@@ -8,34 +8,15 @@ Created on Thu Aug 13 09:53:11 2020
 import sys, os
 import numpy as np
 import scipy.stats as stats
-import pandas as pd
-import shutil
+import matplotlib
+matplotlib.use('agg')
 try:
     import cPickle as pickle
 except ModuleNotFoundError:
     import pickle
 
-from matplotlib.backends.backend_pdf import PdfPages
-import matplotlib.pyplot as plt
-plt.rcParams.update({'font.size': 24})
-plt.rc('figure', figsize = (24, 16))
-plt.rc('font', family='serif', serif='Arial')
-plt.rc('axes', grid = True)
-plt.rc('text', usetex=True)
-plt.rc('xtick', labelsize=24)
-plt.rc('ytick', labelsize=24)
-plt.rc('axes', labelsize=24)
-plt.rc('axes', linewidth=2)
-plt.rc('axes', grid=True)
-plt.rc('grid', linestyle="-")
-
-import matplotlib
-matplotlib.use('agg')
-# Local
-sys.path.insert(0,'./../bayesian-validation/BayesValidRox/')
-
-# Batch script
-# sys.path.insert(0,'./../../bayesian-validation/BayesValidRox/')
+# Add BayesValidRox path
+sys.path.insert(0,'./../../../BayesValidRox/')
 
 from PyLink.PyLinkForwardModel import PyLinkForwardModel
     
@@ -55,16 +36,12 @@ Model.ExecutionPath = os.getcwd()
 Model.Output.Parser = 'read_ffpm'
 Model.Output.Names = ['velocity [m/s]', 'p']
 Model.Output.FileNames = ["ffpm_stokesdarcy_velocity.csv","ffpm_stokesdarcy_p.csv"]
-# # For Bayesian inversion 
-# Model.MeasurementFile = 'data/stokesDataCalib.csv'
 
-# # Include the validation observation data
-# Model.MeasurementFileValid = 'data/stokesDataValid.csv'
 
 #=====================================================
 #=========   PROBABILISTIC INPUT MODEL  ==============
 #=====================================================
-NrSamples = 300
+NrSamples = 10
 
 allParams = [(0.0 , 4.0), # '$\\alpha_{BJ}$'
              (0.00475,0.005125), # '$\\Gamma$'
diff --git a/BayesValidRox/tests/PA-A/ref_stokespnm.py b/BayesValidRox/tests/PA-A/ref_stokespnm.py
index a3c4b2924ef6f677f5d8c8f64954a4ffb1285b7c..55de8de2f0bc5fc9753fea86e02a4fe9e3ccb9a4 100755
--- a/BayesValidRox/tests/PA-A/ref_stokespnm.py
+++ b/BayesValidRox/tests/PA-A/ref_stokespnm.py
@@ -8,38 +8,19 @@ Created on Thu Aug 13 09:53:11 2020
 import sys, os
 import numpy as np
 import scipy.stats as stats
-import pandas as pd
-import shutil
 import chaospy
+import matplotlib
+matplotlib.use('agg')
 try:
     import cPickle as pickle
 except ModuleNotFoundError:
     import pickle
 
-from matplotlib.backends.backend_pdf import PdfPages
-import matplotlib.pyplot as plt
-plt.rcParams.update({'font.size': 24})
-plt.rc('figure', figsize = (24, 16))
-plt.rc('font', family='serif', serif='Arial')
-plt.rc('axes', grid = True)
-plt.rc('text', usetex=True)
-plt.rc('xtick', labelsize=24)
-plt.rc('ytick', labelsize=24)
-plt.rc('axes', labelsize=24)
-plt.rc('axes', linewidth=2)
-plt.rc('axes', grid=True)
-plt.rc('grid', linestyle="-")
-
-import matplotlib
-matplotlib.use('agg')
-# Local
-sys.path.insert(0,'./../bayesian-validation/BayesValidRox/')
-
-# Batch script
-# sys.path.insert(0,'./../../bayesian-validation/BayesValidRox/')
+# Add BayesValidRox path
+sys.path.insert(0,'./../../../BayesValidRox/')
 
 from PyLink.PyLinkForwardModel import PyLinkForwardModel
-    
+
 #=====================================================
 #============   COMPUTATIONAL MODEL   ================
 #=====================================================
@@ -56,12 +37,6 @@ Model.Output.Parser = 'read_ffpm'
 Model.Output.Names = ['velocity [m/s]', 'p']
 Model.Output.FileNames = ["ffpm_stokespnm_velocity.csv","ffpm_stokespnm_p.csv"]
 
-# # For Bayesian inversion 
-# Model.MeasurementFile = 'data/stokesDataCalib.csv'
-
-# # Include the validation observation data
-# Model.MeasurementFileValid = 'data/stokesDataValid.csv'
-
 #=====================================================
 #=========   PROBABILISTIC INPUT MODEL  ==============
 #=====================================================
@@ -79,7 +54,7 @@ origSpaceDist = chaospy.J(*origJoints)
 #=============  RUN THE SIMULATIONS  =================
 #=====================================================
 SamplingMethod = 'random'
-NrSamples = 200
+NrSamples = 10#200
 
 # Generate samples with chaospy
 parametersets = chaospy.generate_samples(NrSamples, domain=origSpaceDist , rule=SamplingMethod).T
@@ -96,4 +71,4 @@ try:
     key = Model.Name + '_'
     Model.zip_subdirs(dir_name, key)
 except:
-    pass
\ No newline at end of file
+    pass
diff --git a/BayesValidRox/tests/PA-A/stokesdarcy_BJ_params.tpl.input b/BayesValidRox/tests/PA-A/stokesdarcy_BJ_params.tpl.input
index b68a97c45b9ab3b03ac558b5fe2c62bc2001e948..52d717a7efcbf55f8082d198d8e04035319653c6 100644
--- a/BayesValidRox/tests/PA-A/stokesdarcy_BJ_params.tpl.input
+++ b/BayesValidRox/tests/PA-A/stokesdarcy_BJ_params.tpl.input
@@ -1,8 +1,8 @@
 [Grid]
 Positions0 = -125e-6 0.010125
 Positions1 = 0 0.6e-2
-Cells0 = 1025
-Cells1 = 600
+Cells0 = 512 #1025
+Cells1 = 300 #600
 
 [Stokes.Grid]
 InletLength = 0.0
diff --git a/BayesValidRox/tests/PA-A/stokesdarcy_ER_params.tpl.input b/BayesValidRox/tests/PA-A/stokesdarcy_ER_params.tpl.input
index 89f8f4b86dc2ffb7e1fbbbbbe0824fed8b72981c..41d8df01064a1c359a5a5f062ab7af6cf49150a5 100644
--- a/BayesValidRox/tests/PA-A/stokesdarcy_ER_params.tpl.input
+++ b/BayesValidRox/tests/PA-A/stokesdarcy_ER_params.tpl.input
@@ -1,8 +1,8 @@
 [Grid]
 Positions0 = -125e-6 0.010125
 Positions1 = 0 0.6e-2
-Cells0 = 1025
-Cells1 = 600
+Cells0 = 512 #1025
+Cells1 = 300 #600
 
 [Stokes.Grid]
 InletLength = 0.0