diff --git a/GaudiTestSuite/tests/pytest/refs/Histograms_opts.yaml b/GaudiTestSuite/tests/pytest/refs/Histograms_opts.yaml
index 98a554bc7d890bdb933e30fe0b780583b8657538..9942010c2e101fbda2e7f5d310d2f5eb705421cb 100644
--- a/GaudiTestSuite/tests/pytest/refs/Histograms_opts.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/Histograms_opts.yaml
@@ -30,8 +30,6 @@ histos:
         RMS: '0.98246'
         Skewness: '-0.0041154'
         Kurtosis: '-0.16179'
-        ? ''
-        : ''
       Histo2:
         ID: Histo2
         Title: '"Histogram 2"'
@@ -40,8 +38,6 @@ histos:
         RMS: '1.0048'
         Skewness: '0.001627'
         Kurtosis: '-0.0045467'
-        ? ''
-        : ''
     header:
       1D: 2
       2D: 0
diff --git a/GaudiTestSuite/tests/pytest/refs/Histograms_py.yaml b/GaudiTestSuite/tests/pytest/refs/Histograms_py.yaml
index e88eed9a770d73a5ad3cf37070597753b29caa80..bfaa52a564d9c2b652ec649ce4541275e9d10ca1 100644
--- a/GaudiTestSuite/tests/pytest/refs/Histograms_py.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/Histograms_py.yaml
@@ -45,8 +45,6 @@ histos:
         RMS: '1.0015'
         Skewness: '0.0079746'
         Kurtosis: '-0.0010546'
-        ? ''
-        : ''
       CustomGauss:
         ID: CustomGauss
         Title: '"Gaussian mean=0, sigma=1, atomic"'
@@ -55,8 +53,6 @@ histos:
         RMS: '1.0015'
         Skewness: '0.0079746'
         Kurtosis: '-0.0010546'
-        ? ''
-        : ''
       CustomGaussNoInit:
         ID: CustomGaussNoInit
         Title: '"Gaussian mean=0, sigma=1, atomic"'
@@ -65,8 +61,6 @@ histos:
         RMS: '1.0015'
         Skewness: '0.0079746'
         Kurtosis: '-0.0010546'
-        ? ''
-        : ''
       CustomGaussNoProp:
         ID: CustomGaussNoProp
         Title: '"Gaussian mean=0, sigma=1, atomic"'
@@ -75,8 +69,6 @@ histos:
         RMS: '1.0015'
         Skewness: '0.0079746'
         Kurtosis: '-0.0010546'
-        ? ''
-        : ''
       CustomGaussW:
         ID: CustomGaussW
         Title: '"Gaussian mean=0, sigma=1, weighted"'
@@ -85,8 +77,6 @@ histos:
         RMS: '1.0015'
         Skewness: '0.0079746'
         Kurtosis: '-0.0010546'
-        ? ''
-        : ''
       Gauss:
         ID: Gauss
         Title: '"Gaussian mean=0, sigma=1, atomic"'
@@ -95,8 +85,6 @@ histos:
         RMS: '1.0015'
         Skewness: '0.0079746'
         Kurtosis: '-0.0010546'
-        ? ''
-        : ''
       GaussBuf:
         ID: GaussBuf
         Title: '"Gaussian mean=0, sigma=1, buffered"'
@@ -105,8 +93,6 @@ histos:
         RMS: '1.0015'
         Skewness: '0.0079746'
         Kurtosis: '-0.0010546'
-        ? ''
-        : ''
       GaussInt:
         ID: GaussInt
         Title: '"Gaussian mean=0, sigma=1, integer values"'
@@ -115,8 +101,6 @@ histos:
         RMS: '0.68219'
         Skewness: '0.012066'
         Kurtosis: '2.4124'
-        ? ''
-        : ''
       GaussNA:
         ID: GaussNA
         Title: '"Gaussian mean=0, sigma=1, non atomic"'
@@ -125,8 +109,6 @@ histos:
         RMS: '1.0015'
         Skewness: '0.0079746'
         Kurtosis: '-0.0010546'
-        ? ''
-        : ''
       GaussW:
         ID: GaussW
         Title: '"Gaussian mean=0, sigma=1, weighted"'
@@ -135,8 +117,6 @@ histos:
         RMS: '1.0015'
         Skewness: '0.0079746'
         Kurtosis: '-0.0010546'
-        ? ''
-        : ''
       LogGauss:
         ID: LogGauss
         Title: '"Log, Gaussian"'
@@ -145,8 +125,6 @@ histos:
         RMS: '0.26059'
         Skewness: '0.96351'
         Kurtosis: '0.08275'
-        ? ''
-        : ''
     header:
       1D: 11
       2D: 8
@@ -226,8 +204,6 @@ histos:
         RMS: '1.0022'
         Skewness: '0.0079034'
         Kurtosis: '0.00508'
-        ? ''
-        : ''
       CustomProfGaussW:
         ID: CustomProfGaussW
         Title: '"Profile, Gaussian mean=0, sigma=1, weighted"'
@@ -236,8 +212,6 @@ histos:
         RMS: '1.0022'
         Skewness: '0.0079034'
         Kurtosis: '0.00508'
-        ? ''
-        : ''
       ProfGauss:
         ID: ProfGauss
         Title: '"Profile, Gaussian mean=0, sigma=1, atomic"'
@@ -246,8 +220,6 @@ histos:
         RMS: '1.0022'
         Skewness: '0.0079034'
         Kurtosis: '0.00508'
-        ? ''
-        : ''
       ProfGaussBuf:
         ID: ProfGaussBuf
         Title: '"Profile, Gaussian mean=0, sigma=1, buffered"'
@@ -256,8 +228,6 @@ histos:
         RMS: '1.0022'
         Skewness: '0.0079034'
         Kurtosis: '0.00508'
-        ? ''
-        : ''
       ProfGaussInt:
         ID: ProfGaussInt
         Title: '"Profile, Gaussian mean=0, sigma=1, integ..."'
@@ -266,8 +236,6 @@ histos:
         RMS: '0.68346'
         Skewness: '0.01007'
         Kurtosis: '2.407'
-        ? ''
-        : ''
       ProfGaussNA:
         ID: ProfGaussNA
         Title: '"Profile, Gaussian mean=0, sigma=1, non a..."'
@@ -276,8 +244,6 @@ histos:
         RMS: '1.0022'
         Skewness: '0.0079034'
         Kurtosis: '0.00508'
-        ? ''
-        : ''
       ProfGaussW:
         ID: ProfGaussW
         Title: '"Profile, Gaussian mean=0, sigma=1, weighted"'
@@ -286,8 +252,6 @@ histos:
         RMS: '1.0022'
         Skewness: '0.0079034'
         Kurtosis: '0.00508'
-        ? ''
-        : ''
     2DProf:
       CustomProfGaussFlat:
       - CustomProfGaussFlat
@@ -327,8 +291,6 @@ histos:
         RMS: '1.0016'
         Skewness: '0.019119'
         Kurtosis: '0.033422'
-        ? ''
-        : ''
       Gauss:
         ID: Gauss
         Title: '"Gaussian mean=0, sigma=1, atomic"'
@@ -337,8 +299,6 @@ histos:
         RMS: '1.0016'
         Skewness: '0.019119'
         Kurtosis: '0.033422'
-        ? ''
-        : ''
       GaussBuf:
         ID: GaussBuf
         Title: '"Gaussian mean=0, sigma=1, buffered"'
@@ -347,8 +307,6 @@ histos:
         RMS: '1.0016'
         Skewness: '0.019119'
         Kurtosis: '0.033422'
-        ? ''
-        : ''
     header:
       1D: 3
       2D: 3
diff --git a/GaudiTestSuite/tests/pytest/refs/config2/Histograms.yaml b/GaudiTestSuite/tests/pytest/refs/config2/Histograms.yaml
index 656ae5a483d6ff7beaafa873c6f640878620804c..cadc597c8459b10a267a00c71fb43d41b65d8084 100644
--- a/GaudiTestSuite/tests/pytest/refs/config2/Histograms.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/config2/Histograms.yaml
@@ -36,8 +36,6 @@ histos:
         RMS: '0.99458'
         Skewness: '-0.0074248'
         Kurtosis: '0.0016078'
-        ? ''
-        : ''
       GaussBuf:
         ID: GaussBuf
         Title: '"Gaussian mean=0, sigma=1, buffered"'
@@ -46,8 +44,6 @@ histos:
         RMS: '0.99458'
         Skewness: '-0.0074248'
         Kurtosis: '0.0016078'
-        ? ''
-        : ''
       GaussInt:
         ID: GaussInt
         Title: '"Gaussian mean=0, sigma=1, integer v..."'
@@ -56,8 +52,6 @@ histos:
         RMS: '0.67652'
         Skewness: '-0.01245'
         Kurtosis: '2.4154'
-        ? ''
-        : ''
       GaussNA:
         ID: GaussNA
         Title: '"Gaussian mean=0, sigma=1, non atomic"'
@@ -66,8 +60,6 @@ histos:
         RMS: '0.99458'
         Skewness: '-0.0074248'
         Kurtosis: '0.0016078'
-        ? ''
-        : ''
       GaussW:
         ID: GaussW
         Title: '"Gaussian mean=0, sigma=1, weighted"'
@@ -76,8 +68,6 @@ histos:
         RMS: '0.99458'
         Skewness: '-0.0074248'
         Kurtosis: '0.0016078'
-        ? ''
-        : ''
     header:
       1D: 5
       2D: 5
@@ -137,8 +127,6 @@ histos:
         RMS: '0.99456'
         Skewness: '-0.0015638'
         Kurtosis: '0.0048845'
-        ? ''
-        : ''
       ProfGaussBuf:
         ID: ProfGaussBuf
         Title: '"Profile, Gaussian mean=0, sigma=1, ..."'
@@ -147,8 +135,6 @@ histos:
         RMS: '0.99456'
         Skewness: '-0.0015638'
         Kurtosis: '0.0048845'
-        ? ''
-        : ''
       ProfGaussInt:
         ID: ProfGaussInt
         Title: '"Profile, Gaussian mean=0, sigma=1, ..."'
@@ -157,8 +143,6 @@ histos:
         RMS: '0.67755'
         Skewness: '-0.0026721'
         Kurtosis: '2.4174'
-        ? ''
-        : ''
       ProfGaussNA:
         ID: ProfGaussNA
         Title: '"Profile, Gaussian mean=0, sigma=1, ..."'
@@ -167,8 +151,6 @@ histos:
         RMS: '0.99456'
         Skewness: '-0.0015638'
         Kurtosis: '0.0048845'
-        ? ''
-        : ''
       ProfGaussW:
         ID: ProfGaussW
         Title: '"Profile, Gaussian mean=0, sigma=1, ..."'
@@ -177,8 +159,6 @@ histos:
         RMS: '0.99456'
         Skewness: '-0.0015638'
         Kurtosis: '0.0048845'
-        ? ''
-        : ''
     2DProf:
       ProfGaussFlat:
       - ProfGaussFlat
diff --git a/GaudiTestSuite/tests/pytest/refs/config2/Histograms_wg.yaml b/GaudiTestSuite/tests/pytest/refs/config2/Histograms_wg.yaml
index 6b5f46742aeb31497cc859d998addf7d1ded4f92..26f5951488532501e1f49f8a3d0403a2fcda2ddc 100644
--- a/GaudiTestSuite/tests/pytest/refs/config2/Histograms_wg.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/config2/Histograms_wg.yaml
@@ -37,8 +37,6 @@ histos:
         RMS: '0.99458'
         Skewness: '-0.0074248'
         Kurtosis: '0.0016078'
-        ? ''
-        : ''
       CustomGaussNoProp:
         ID: CustomGaussNoProp
         Title: '"Gaussian mean=0, sigma=1, atomic"'
@@ -47,8 +45,6 @@ histos:
         RMS: '0.99458'
         Skewness: '-0.0074248'
         Kurtosis: '0.0016078'
-        ? ''
-        : ''
       Gauss:
         ID: Gauss
         Title: '"Gaussian mean=0, sigma=1, atomic"'
@@ -57,8 +53,6 @@ histos:
         RMS: '0.99458'
         Skewness: '-0.0074248'
         Kurtosis: '0.0016078'
-        ? ''
-        : ''
       GaussBuf:
         ID: GaussBuf
         Title: '"Gaussian mean=0, sigma=1, buffered"'
@@ -67,8 +61,6 @@ histos:
         RMS: '0.99458'
         Skewness: '-0.0074248'
         Kurtosis: '0.0016078'
-        ? ''
-        : ''
       GaussInt:
         ID: GaussInt
         Title: '"Gaussian mean=0, sigma=1, integer values"'
@@ -77,8 +69,6 @@ histos:
         RMS: '0.67652'
         Skewness: '-0.01245'
         Kurtosis: '2.4154'
-        ? ''
-        : ''
       GaussNA:
         ID: GaussNA
         Title: '"Gaussian mean=0, sigma=1, non atomic"'
@@ -87,8 +77,6 @@ histos:
         RMS: '0.99458'
         Skewness: '-0.0074248'
         Kurtosis: '0.0016078'
-        ? ''
-        : ''
       GaussW:
         ID: GaussW
         Title: '"Gaussian mean=0, sigma=1, weighted"'
@@ -97,8 +85,6 @@ histos:
         RMS: '0.99458'
         Skewness: '-0.0074248'
         Kurtosis: '0.0016078'
-        ? ''
-        : ''
       LogGauss:
         ID: LogGauss
         Title: '"Log, Gaussian"'
@@ -107,8 +93,6 @@ histos:
         RMS: '0.25849'
         Skewness: '1.0238'
         Kurtosis: '0.18686'
-        ? ''
-        : ''
     header:
       1D: 8
       2D: 8
@@ -188,8 +172,6 @@ histos:
         RMS: '0.99456'
         Skewness: '-0.0015638'
         Kurtosis: '0.0048845'
-        ? ''
-        : ''
       ProfGaussBuf:
         ID: ProfGaussBuf
         Title: '"Profile, Gaussian mean=0, sigma=1, buffered"'
@@ -198,8 +180,6 @@ histos:
         RMS: '0.99456'
         Skewness: '-0.0015638'
         Kurtosis: '0.0048845'
-        ? ''
-        : ''
       ProfGaussInt:
         ID: ProfGaussInt
         Title: '"Profile, Gaussian mean=0, sigma=1, integ..."'
@@ -208,8 +188,6 @@ histos:
         RMS: '0.67755'
         Skewness: '-0.0026721'
         Kurtosis: '2.4174'
-        ? ''
-        : ''
       ProfGaussNA:
         ID: ProfGaussNA
         Title: '"Profile, Gaussian mean=0, sigma=1, non a..."'
@@ -218,8 +196,6 @@ histos:
         RMS: '0.99456'
         Skewness: '-0.0015638'
         Kurtosis: '0.0048845'
-        ? ''
-        : ''
       ProfGaussW:
         ID: ProfGaussW
         Title: '"Profile, Gaussian mean=0, sigma=1, weighted"'
@@ -228,8 +204,6 @@ histos:
         RMS: '0.99456'
         Skewness: '-0.0015638'
         Kurtosis: '0.0048845'
-        ? ''
-        : ''
     2DProf:
       CustomProfGaussFlat:
       - CustomProfGaussFlat