diff --git a/uqpce/test_suite/test_uqpce/mdao/cdf/test_cdfgroup.py b/uqpce/test_suite/test_uqpce/mdao/cdf/test_cdfgroup.py
index 10b8706..cce47f6 100644
--- a/uqpce/test_suite/test_uqpce/mdao/cdf/test_cdfgroup.py
+++ b/uqpce/test_suite/test_uqpce/mdao/cdf/test_cdfgroup.py
@@ -19,12 +19,14 @@ def setUp(self):
         self.cil = self.sig/2
         self.cih = 1-self.cil
         a, b = 2.31, 0.627
-        self.beta_samples = beta.rvs(a, b, size=aleat_cnt)
+        thresh = 1e-8
+        pcnts = np.linspace(thresh, 1-thresh, num=aleat_cnt)
+        self.beta_samples = beta(a, b).ppf(pcnts)
 
-        self.expon_samples = expon.rvs(size=aleat_cnt)
+        self.expon_samples = expon.ppf(pcnts)
 
         n, p = 5, 0.5
-        self.nbinom_samples = nbinom.rvs(n, p, size=aleat_cnt)
+        self.nbinom_samples = nbinom(n, p).ppf(pcnts)
 
     def test_beta(self):
         alpha = 0.05
diff --git a/uqpce/test_suite/test_uqpce/mdao/test_uqpcegroup.py b/uqpce/test_suite/test_uqpce/mdao/test_uqpcegroup.py
index f7fa009..07a2209 100644
--- a/uqpce/test_suite/test_uqpce/mdao/test_uqpcegroup.py
+++ b/uqpce/test_suite/test_uqpce/mdao/test_uqpcegroup.py
@@ -30,9 +30,9 @@ def setUp(self):
         ])
         resampled_var_basis = np.zeros([total_cnt, 3])
         resampled_var_basis[:,0] = 1
-        resampled_var_basis[:,1] = np.random.uniform(low=-2, high=2, size=total_cnt)
-        resampled_var_basis[:,2] = np.random.uniform(low=-1, high=1, size=total_cnt)
-        
+        resampled_var_basis[:,1] = np.linspace(-2, 2, num=total_cnt)
+        resampled_var_basis[:,2] = np.linspace(-1, 1, num=total_cnt)
+
         prob = om.Problem(reports=False)
         prob.model.add_subsystem(
             'parab', paraboloid.Paraboloid(vec_size=6),
@@ -42,9 +42,9 @@ def setUp(self):
             'comp',
             UQPCEGroup(
                 uncert_list=['f_abxy'],
-                var_basis=var_basis, norm_sq=norm_sq, significance=sig, 
+                var_basis=var_basis, norm_sq=norm_sq, significance=sig,
                 resampled_var_basis=resampled_var_basis, tail='both',
-                aleatory_cnt=aleat_cnt, epistemic_cnt=epist_cnt, sample_ref0=[100], 
+                aleatory_cnt=aleat_cnt, epistemic_cnt=epist_cnt, sample_ref0=[100],
                 sample_ref=[125]
             ),
             promotes_inputs=['*'], promotes_outputs=['*']
@@ -74,12 +74,12 @@ def test_partials(self):
             [('mean', 'responses')]['rel error'][0]
         )
         self.assertTrue(
-            np.isclose(coeff_err_coeff, 0), 
+            np.isclose(coeff_err_coeff, 0),
             msg='CoefficientComp derivative (\'matrix_coeffs\', \'responses\') '
             'is not correct'
         )
         self.assertTrue(
-            np.isclose(coeff_err_mean, 0), 
+            np.isclose(coeff_err_mean, 0),
             msg='CoefficientComp derivative (\'mean\', \'responses\') '
             'is not correct'
         )
@@ -90,7 +90,7 @@ def test_partials(self):
             [('resampled_responses', 'matrix_coeffs')]['rel error'][0]
         )
         self.assertTrue(
-            np.isclose(resamp_err_resamp, 0), 
+            np.isclose(resamp_err_resamp, 0),
             msg='ResampleComp derivative (\'resampled_responses\', '
             '\'matrix_coeffs\') is not correct'
         )
@@ -101,7 +101,7 @@ def test_partials(self):
             [('variance', 'matrix_coeffs')]['abs error'][0]
         )
         self.assertTrue(
-            np.isclose(var_err_coeff, 0), 
+            np.isclose(var_err_coeff, 0),
             msg='VarianceComp derivative (\'variance\', \'matrix_coeffs\') '
             'is not correct'
         )
@@ -125,19 +125,19 @@ def test_partials(self):
         )
 
         self.assertTrue(
-            np.isclose(lower_cdf_samp, 0), 
+            np.isclose(lower_cdf_samp, 0),
             msg='CDFGroup derivative (\'ci_resid\', \'samples\') is not correct'
         )
         self.assertTrue(
-            np.isclose(upper_cdf_samp, 0), 
+            np.isclose(upper_cdf_samp, 0),
             msg='CDFGroup derivative (\'ci_resid\', \'samples\') is not correct'
         )
         self.assertTrue(
-            np.isclose(lower_cdf_fci, 0), 
+            np.isclose(lower_cdf_fci, 0),
             msg='CDFGroup derivative (\'ci_resid\', \'f_ci\') is not correct'
         )
         self.assertTrue(
-            np.isclose(upper_cdf_fci, 0), 
+            np.isclose(upper_cdf_fci, 0),
             msg='CDFGroup derivative (\'ci_resid\', \'f_ci\') is not correct'
         )