diff --git a/kat_test/random/bs_cav_xbeta_misaligned_fsig_xbeta_1.kat b/kat_test/random/bs_cav_xbeta_misaligned_fsig_xbeta_1.kat
new file mode 100644
index 0000000000000000000000000000000000000000..d53142b526775f9745ee2c6ad67652645a9ac7af
--- /dev/null
+++ b/kat_test/random/bs_cav_xbeta_misaligned_fsig_xbeta_1.kat
@@ -0,0 +1,21 @@
+# This file is based on some testing done when we realised the pitch
+# beamsplitter signals did not have the correct cos(AoI) scaling applied.
+
+l psl 1.0 0.0 0.0 npsl
+mod EOM 9000000.0 0.001 1 pm 0.0 npsl nEOM1
+s s1 0.0 nEOM1 nITM1
+bs ITM 0.98 0.02 0.0 0.0 nITM1 nITM1r nITM2 nITM2b
+attr ITM Rcx -2500.0
+attr ITM Rcy -2500.0
+s s_cav_a 5000.0 nITM2 nETM1
+s s_cav_b 5000.0 nITM2b nETM1b
+bs ETM 1.0 0.0 0.0 20.0 nETM1 nETM1b dump dump
+attr ETM Rcx 2700.0
+attr ETM Rcy 2700.0
+pd2 tf1 9000000 0.0 $fs nITM1r
+cav c1 ITM nITM2 ITM nITM2b
+fsig sig1 ETM xbeta 1e-10 0.0 1.0
+maxtem 2
+xaxis ETM xbeta log 1e-8 1e-5 100
+yaxis log abs
+gnuterm no
\ No newline at end of file
diff --git a/kat_test/random/bs_cav_xbeta_misaligned_fsig_xbeta_2.kat b/kat_test/random/bs_cav_xbeta_misaligned_fsig_xbeta_2.kat
new file mode 100644
index 0000000000000000000000000000000000000000..accbd0b3b6aa639c5c64fc2f052d34e1b2f8c0a7
--- /dev/null
+++ b/kat_test/random/bs_cav_xbeta_misaligned_fsig_xbeta_2.kat
@@ -0,0 +1,21 @@
+# This file is based on some testing done when we realised the pitch
+# beamsplitter signals did not have the correct cos(AoI) scaling applied.
+
+l psl 1.0 0.0 0.0 npsl
+mod EOM 9000000.0 0.001 1 pm 0.0 npsl nEOM1
+s s1 0.0 nEOM1 nITM1
+bs ITM 0.98 0.02 0.0 0.0 nITM1 nITM1r nITM2 nITM2b
+attr ITM Rcx -2500.0
+attr ITM Rcy -2500.0
+s s_cav_a 5000.0 nITM2 nETM1
+s s_cav_b 5000.0 nITM2b nETM1b
+bs ETM 1.0 0.0 0.0 20.0 dump dump nETM1 nETM1b
+attr ETM Rcx -2700.0
+attr ETM Rcy -2700.0
+pd2 tf1 9000000 0.0 $fs nITM1r
+cav c1 ITM nITM2 ITM nITM2b
+fsig sig1 ETM xbeta 1e-10 0.0 1.0
+maxtem 2
+xaxis ETM xbeta log 1e-8 1e-5 100
+yaxis log abs
+gnuterm no
\ No newline at end of file
diff --git a/kat_test/random/bs_cav_xbeta_misaligned_fsig_ybeta_1.kat b/kat_test/random/bs_cav_xbeta_misaligned_fsig_ybeta_1.kat
new file mode 100644
index 0000000000000000000000000000000000000000..3a12bf207647395734e226b5d49a1d18fb702fa4
--- /dev/null
+++ b/kat_test/random/bs_cav_xbeta_misaligned_fsig_ybeta_1.kat
@@ -0,0 +1,21 @@
+# This file is based on some testing done when we realised the pitch
+# beamsplitter signals did not have the correct cos(AoI) scaling applied.
+
+l psl 1.0 0.0 0.0 npsl
+mod EOM 9000000.0 0.001 1 pm 0.0 npsl nEOM1
+s s1 0.0 nEOM1 nITM1
+bs ITM 0.98 0.02 0.0 0.0 nITM1 nITM1r nITM2 nITM2b
+attr ITM Rcx -2500.0
+attr ITM Rcy -2500.0
+s s_cav_a 5000.0 nITM2 nETM1
+s s_cav_b 5000.0 nITM2b nETM1b
+bs ETM 1.0 0.0 0.0 20.0 nETM1 nETM1b dump dump
+attr ETM Rcx 2700.0
+attr ETM Rcy 2700.0
+pd2 tf1 9000000 0.0 $fs nITM1r
+cav c1 ITM nITM2 ITM nITM2b
+fsig sig1 ETM ybeta 1e-10 0.0 1.0
+maxtem 2
+xaxis ETM xbeta log 1e-8 1e-5 100
+yaxis log abs
+gnuterm no
\ No newline at end of file
diff --git a/kat_test/random/bs_cav_xbeta_misaligned_fsig_ybeta_2.kat b/kat_test/random/bs_cav_xbeta_misaligned_fsig_ybeta_2.kat
new file mode 100644
index 0000000000000000000000000000000000000000..67ea0d65439397d62683bf6efe45cb0809c7e6db
--- /dev/null
+++ b/kat_test/random/bs_cav_xbeta_misaligned_fsig_ybeta_2.kat
@@ -0,0 +1,21 @@
+# This file is based on some testing done when we realised the pitch
+# beamsplitter signals did not have the correct cos(AoI) scaling applied.
+
+l psl 1.0 0.0 0.0 npsl
+mod EOM 9000000.0 0.001 1 pm 0.0 npsl nEOM1
+s s1 0.0 nEOM1 nITM1
+bs ITM 0.98 0.02 0.0 0.0 nITM1 nITM1r nITM2 nITM2b
+attr ITM Rcx -2500.0
+attr ITM Rcy -2500.0
+s s_cav_a 5000.0 nITM2 nETM1
+s s_cav_b 5000.0 nITM2b nETM1b
+bs ETM 1.0 0.0 0.0 20.0 dump dump nETM1 nETM1b
+attr ETM Rcx -2700.0
+attr ETM Rcy -2700.0
+pd2 tf1 9000000 0.0 $fs nITM1r
+cav c1 ITM nITM2 ITM nITM2b
+fsig sig1 ETM ybeta 1e-10 0.0 1.0
+maxtem 2
+xaxis ETM xbeta log 1e-8 1e-5 100
+yaxis log abs
+gnuterm no
\ No newline at end of file
diff --git a/kat_test/random/bs_cav_ybeta_misaligned_fsig_ybeta_1.kat b/kat_test/random/bs_cav_ybeta_misaligned_fsig_ybeta_1.kat
new file mode 100644
index 0000000000000000000000000000000000000000..6e7a2a60e4e8d3762ba19667828d3c17282ea8e9
--- /dev/null
+++ b/kat_test/random/bs_cav_ybeta_misaligned_fsig_ybeta_1.kat
@@ -0,0 +1,21 @@
+# This file is based on some testing done when we realised the pitch
+# beamsplitter signals did not have the correct cos(AoI) scaling applied.
+
+l psl 1.0 0.0 0.0 npsl
+mod EOM 9000000.0 0.001 1 pm 0.0 npsl nEOM1
+s s1 0.0 nEOM1 nITM1
+bs ITM 0.98 0.02 0.0 0.0 nITM1 nITM1r nITM2 nITM2b
+attr ITM Rcx -2500.0
+attr ITM Rcy -2500.0
+s s_cav_a 5000.0 nITM2 nETM1
+s s_cav_b 5000.0 nITM2b nETM1b
+bs ETM 1.0 0.0 0.0 20.0 nETM1 nETM1b dump dump
+attr ETM Rcx 2700.0
+attr ETM Rcy 2700.0
+pd2 tf1 9000000 0.0 $fs nITM1r
+cav c1 ITM nITM2 ITM nITM2b
+fsig sig1 ETM ybeta 1e-10 0.0 1.0
+maxtem 2
+xaxis ETM ybeta log 1e-8 1e-5 100
+yaxis log abs
+gnuterm no
\ No newline at end of file
diff --git a/kat_test/random/bs_cav_ybeta_misaligned_fsig_ybeta_2.kat b/kat_test/random/bs_cav_ybeta_misaligned_fsig_ybeta_2.kat
new file mode 100644
index 0000000000000000000000000000000000000000..a5ff1a705862df21849e68a72c0b3ef8d3ece123
--- /dev/null
+++ b/kat_test/random/bs_cav_ybeta_misaligned_fsig_ybeta_2.kat
@@ -0,0 +1,22 @@
+# This file is based on some testing done when we realised the pitch
+# beamsplitter signals did not have the correct cos(AoI) scaling applied.
+
+l psl 1.0 0.0 0.0 npsl
+mod EOM 9000000.0 0.001 1 pm 0.0 npsl nEOM1
+s s1 0.0 nEOM1 nITM1
+bs ITM 0.98 0.02 0.0 0.0 nITM1 nITM1r nITM2 nITM2b
+attr ITM Rcx -2500.0
+attr ITM Rcy -2500.0
+s s_cav_a 5000.0 nITM2 nETM1
+s s_cav_b 5000.0 nITM2b nETM1b
+bs ETM 1.0 0.0 0.0 20.0 dump dump nETM1 nETM1b
+attr ETM Rcx -2700.0
+attr ETM Rcy -2700.0
+attr ETM ybeta 1e-05
+pd1 pdh1 9000000 0.0 nITM1r
+pd2 tf1 9000000 0.0 $fs nITM1r
+cav c1 ITM nITM2 ITM nITM2b
+fsig sig1 ETM ybeta 1e-10 0.0 1.0
+maxtem 2
+noxaxis
+yaxis abs
\ No newline at end of file
diff --git a/kat_test/random/reference/bs_cav_xbeta_misaligned_fsig_xbeta_1.out b/kat_test/random/reference/bs_cav_xbeta_misaligned_fsig_xbeta_1.out
new file mode 100644
index 0000000000000000000000000000000000000000..a1df5e59cf7f64426a6545ea60ced66b296e549f
--- /dev/null
+++ b/kat_test/random/reference/bs_cav_xbeta_misaligned_fsig_xbeta_1.out
@@ -0,0 +1,101 @@
+ 9.99999999999998e-09  397.176599561242 
+ 1.07151930523760e-08  425.580551424507 
+ 1.14815362149688e-08  456.015436796406 
+ 1.23026877081237e-08  488.626361942916 
+ 1.31825673855640e-08  523.568765274415 
+ 1.41253754462274e-08  561.009140627089 
+ 1.51356124843619e-08  601.125806549523 
+ 1.62181009735891e-08  644.109722694154 
+ 1.73780082874936e-08  690.165353627843 
+ 1.86208713666284e-08  739.511579187219 
+ 1.99526231496885e-08  792.382648742627 
+ 2.13796208950220e-08  849.029174160160 
+ 2.29086765276773e-08  909.719152528399 
+ 2.45470891568498e-08  974.739004367041 
+ 2.63026799189533e-08  1044.39460539423 
+ 2.81838293126439e-08  1119.01227905144 
+ 3.01995172040194e-08  1198.93970155020 
+ 3.23593656929620e-08  1284.54664935145 
+ 3.46736850452522e-08  1376.22548810933 
+ 3.71535229097162e-08  1474.39125855519 
+ 3.98107170553486e-08  1579.48115346637 
+ 4.26579518801580e-08  1691.95309366112 
+ 4.57088189614860e-08  1812.28299005823 
+ 4.89778819368430e-08  1940.96010970603 
+ 5.24807460249755e-08  2078.47972786009 
+ 5.62341325190328e-08  2225.33192078243 
+ 6.02559586074335e-08  2381.98490197540 
+ 6.45654229034631e-08  2548.86068547344 
+ 6.91830970918910e-08  2726.30002073394 
+ 7.41310241300886e-08  2914.51242317302 
+ 7.94328234724248e-08  3113.50565959101 
+ 8.51138038202337e-08  3322.98719244617 
+ 9.12010839355867e-08  3542.22785115252 
+ 9.77237220955765e-08  3769.87552655339 
+ 1.04712854805085e-07  4003.70439951330 
+ 1.12201845430191e-07  4240.28406888031 
+ 1.20226443461735e-07  4474.55482422641 
+ 1.28824955169307e-07  4699.30361904726 
+ 1.38038426460281e-07  4904.55565677498 
+ 1.47910838816813e-07  5076.93718716421 
+ 1.58489319246102e-07  5199.13631077397 
+ 1.69824365246165e-07  5249.69833492077 
+ 1.81970085860987e-07  5203.53561949627 
+ 1.94984459975793e-07  5033.67025549323 
+ 2.08929613085391e-07  4714.76066692175 
+ 2.23872113856820e-07  4228.71320266967 
+ 2.39883291901934e-07  3571.94637312639 
+ 2.57039578276869e-07  2762.62279718622 
+ 2.75422870333798e-07  1844.82457229720 
+ 2.95120922666618e-07  886.263539419481 
+ 3.16227766016816e-07  32.1769012191881 
+ 3.38844156139178e-07  833.008926056978 
+ 3.63078054770075e-07  1459.00068012713 
+ 3.89045144994252e-07  1883.69797162772 
+ 4.16869383470304e-07  2112.11752806422 
+ 4.46683592150928e-07  2173.01204890218 
+ 4.78630092322601e-07  2107.34798949482 
+ 5.12861383991324e-07  1957.70104544234 
+ 5.49540873857579e-07  1761.19972392606 
+ 5.88843655355540e-07  1546.36086548999 
+ 6.30957344480141e-07  1332.81992313363 
+ 6.76082975391924e-07  1132.64513563914 
+ 7.24435960074927e-07  952.196473388731 
+ 7.76247116628624e-07  793.914583485528 
+ 8.31763771102597e-07  657.772793924961 
+ 8.91250938133664e-07  542.338089297798 
+ 9.54992586021348e-07  445.488272081923 
+ 1.02329299228066e-06  364.864841766245 
+ 1.09647819614308e-06  298.139181454333 
+ 1.17489755493942e-06  243.154835139311 
+ 1.25892541179405e-06  197.991826264183 
+ 1.34896288259152e-06  160.984519185187 
+ 1.44543977074578e-06  130.713589434191 
+ 1.54881661891233e-06  105.984979389632 
+ 1.65958690743739e-06  85.8035709167645 
+ 1.77827941003874e-06  69.3459882917777 
+ 1.90546071796305e-06  55.9348656985513 
+ 2.04173794466931e-06  45.0156394594268 
+ 2.18776162394931e-06  36.1361550827094 
+ 2.34422881531967e-06  28.9289192497388 
+ 2.51188643150930e-06  23.0955700477352 
+ 2.69153480392661e-06  18.3930468769427 
+ 2.88403150312628e-06  14.6209993426371 
+ 3.09029543251324e-06  11.6100555788852 
+ 3.31131121482553e-06  9.21019915724122 
+ 3.54813389233533e-06  7.27913948062049 
+ 3.80189396320516e-06  5.71412485976346 
+ 4.07380277804064e-06  4.51591173600697 
+ 4.36515832240112e-06  3.51469116650077 
+ 4.67735141287141e-06  2.61147358576784 
+ 5.01187233627210e-06  1.80148308732185 
+ 5.37031796370184e-06  1.11710989114631 
+ 5.75439937337083e-06  0.601745705808316 
+ 6.16595001861403e-06  0.269044632885760 
+ 6.60693448007509e-06  0.0886352629965147 
+ 7.07945784384044e-06  0.00854394764086125 
+ 7.58577575029083e-06  0.0175073187697312 
+ 8.12830516163990e-06  0.0195511465869850 
+ 8.70963589955962e-06  0.0136571740112636 
+ 9.33254300796864e-06  0.00724957987421045 
+ 1.00000000000000e-05  0.00296884823472930 
diff --git a/kat_test/random/reference/bs_cav_xbeta_misaligned_fsig_xbeta_2.out b/kat_test/random/reference/bs_cav_xbeta_misaligned_fsig_xbeta_2.out
new file mode 100644
index 0000000000000000000000000000000000000000..a1df5e59cf7f64426a6545ea60ced66b296e549f
--- /dev/null
+++ b/kat_test/random/reference/bs_cav_xbeta_misaligned_fsig_xbeta_2.out
@@ -0,0 +1,101 @@
+ 9.99999999999998e-09  397.176599561242 
+ 1.07151930523760e-08  425.580551424507 
+ 1.14815362149688e-08  456.015436796406 
+ 1.23026877081237e-08  488.626361942916 
+ 1.31825673855640e-08  523.568765274415 
+ 1.41253754462274e-08  561.009140627089 
+ 1.51356124843619e-08  601.125806549523 
+ 1.62181009735891e-08  644.109722694154 
+ 1.73780082874936e-08  690.165353627843 
+ 1.86208713666284e-08  739.511579187219 
+ 1.99526231496885e-08  792.382648742627 
+ 2.13796208950220e-08  849.029174160160 
+ 2.29086765276773e-08  909.719152528399 
+ 2.45470891568498e-08  974.739004367041 
+ 2.63026799189533e-08  1044.39460539423 
+ 2.81838293126439e-08  1119.01227905144 
+ 3.01995172040194e-08  1198.93970155020 
+ 3.23593656929620e-08  1284.54664935145 
+ 3.46736850452522e-08  1376.22548810933 
+ 3.71535229097162e-08  1474.39125855519 
+ 3.98107170553486e-08  1579.48115346637 
+ 4.26579518801580e-08  1691.95309366112 
+ 4.57088189614860e-08  1812.28299005823 
+ 4.89778819368430e-08  1940.96010970603 
+ 5.24807460249755e-08  2078.47972786009 
+ 5.62341325190328e-08  2225.33192078243 
+ 6.02559586074335e-08  2381.98490197540 
+ 6.45654229034631e-08  2548.86068547344 
+ 6.91830970918910e-08  2726.30002073394 
+ 7.41310241300886e-08  2914.51242317302 
+ 7.94328234724248e-08  3113.50565959101 
+ 8.51138038202337e-08  3322.98719244617 
+ 9.12010839355867e-08  3542.22785115252 
+ 9.77237220955765e-08  3769.87552655339 
+ 1.04712854805085e-07  4003.70439951330 
+ 1.12201845430191e-07  4240.28406888031 
+ 1.20226443461735e-07  4474.55482422641 
+ 1.28824955169307e-07  4699.30361904726 
+ 1.38038426460281e-07  4904.55565677498 
+ 1.47910838816813e-07  5076.93718716421 
+ 1.58489319246102e-07  5199.13631077397 
+ 1.69824365246165e-07  5249.69833492077 
+ 1.81970085860987e-07  5203.53561949627 
+ 1.94984459975793e-07  5033.67025549323 
+ 2.08929613085391e-07  4714.76066692175 
+ 2.23872113856820e-07  4228.71320266967 
+ 2.39883291901934e-07  3571.94637312639 
+ 2.57039578276869e-07  2762.62279718622 
+ 2.75422870333798e-07  1844.82457229720 
+ 2.95120922666618e-07  886.263539419481 
+ 3.16227766016816e-07  32.1769012191881 
+ 3.38844156139178e-07  833.008926056978 
+ 3.63078054770075e-07  1459.00068012713 
+ 3.89045144994252e-07  1883.69797162772 
+ 4.16869383470304e-07  2112.11752806422 
+ 4.46683592150928e-07  2173.01204890218 
+ 4.78630092322601e-07  2107.34798949482 
+ 5.12861383991324e-07  1957.70104544234 
+ 5.49540873857579e-07  1761.19972392606 
+ 5.88843655355540e-07  1546.36086548999 
+ 6.30957344480141e-07  1332.81992313363 
+ 6.76082975391924e-07  1132.64513563914 
+ 7.24435960074927e-07  952.196473388731 
+ 7.76247116628624e-07  793.914583485528 
+ 8.31763771102597e-07  657.772793924961 
+ 8.91250938133664e-07  542.338089297798 
+ 9.54992586021348e-07  445.488272081923 
+ 1.02329299228066e-06  364.864841766245 
+ 1.09647819614308e-06  298.139181454333 
+ 1.17489755493942e-06  243.154835139311 
+ 1.25892541179405e-06  197.991826264183 
+ 1.34896288259152e-06  160.984519185187 
+ 1.44543977074578e-06  130.713589434191 
+ 1.54881661891233e-06  105.984979389632 
+ 1.65958690743739e-06  85.8035709167645 
+ 1.77827941003874e-06  69.3459882917777 
+ 1.90546071796305e-06  55.9348656985513 
+ 2.04173794466931e-06  45.0156394594268 
+ 2.18776162394931e-06  36.1361550827094 
+ 2.34422881531967e-06  28.9289192497388 
+ 2.51188643150930e-06  23.0955700477352 
+ 2.69153480392661e-06  18.3930468769427 
+ 2.88403150312628e-06  14.6209993426371 
+ 3.09029543251324e-06  11.6100555788852 
+ 3.31131121482553e-06  9.21019915724122 
+ 3.54813389233533e-06  7.27913948062049 
+ 3.80189396320516e-06  5.71412485976346 
+ 4.07380277804064e-06  4.51591173600697 
+ 4.36515832240112e-06  3.51469116650077 
+ 4.67735141287141e-06  2.61147358576784 
+ 5.01187233627210e-06  1.80148308732185 
+ 5.37031796370184e-06  1.11710989114631 
+ 5.75439937337083e-06  0.601745705808316 
+ 6.16595001861403e-06  0.269044632885760 
+ 6.60693448007509e-06  0.0886352629965147 
+ 7.07945784384044e-06  0.00854394764086125 
+ 7.58577575029083e-06  0.0175073187697312 
+ 8.12830516163990e-06  0.0195511465869850 
+ 8.70963589955962e-06  0.0136571740112636 
+ 9.33254300796864e-06  0.00724957987421045 
+ 1.00000000000000e-05  0.00296884823472930 
diff --git a/kat_test/random/reference/bs_cav_ybeta_misaligned_fsig_xbeta_1.out b/kat_test/random/reference/bs_cav_ybeta_misaligned_fsig_xbeta_1.out
new file mode 100644
index 0000000000000000000000000000000000000000..a1df5e59cf7f64426a6545ea60ced66b296e549f
--- /dev/null
+++ b/kat_test/random/reference/bs_cav_ybeta_misaligned_fsig_xbeta_1.out
@@ -0,0 +1,101 @@
+ 9.99999999999998e-09  397.176599561242 
+ 1.07151930523760e-08  425.580551424507 
+ 1.14815362149688e-08  456.015436796406 
+ 1.23026877081237e-08  488.626361942916 
+ 1.31825673855640e-08  523.568765274415 
+ 1.41253754462274e-08  561.009140627089 
+ 1.51356124843619e-08  601.125806549523 
+ 1.62181009735891e-08  644.109722694154 
+ 1.73780082874936e-08  690.165353627843 
+ 1.86208713666284e-08  739.511579187219 
+ 1.99526231496885e-08  792.382648742627 
+ 2.13796208950220e-08  849.029174160160 
+ 2.29086765276773e-08  909.719152528399 
+ 2.45470891568498e-08  974.739004367041 
+ 2.63026799189533e-08  1044.39460539423 
+ 2.81838293126439e-08  1119.01227905144 
+ 3.01995172040194e-08  1198.93970155020 
+ 3.23593656929620e-08  1284.54664935145 
+ 3.46736850452522e-08  1376.22548810933 
+ 3.71535229097162e-08  1474.39125855519 
+ 3.98107170553486e-08  1579.48115346637 
+ 4.26579518801580e-08  1691.95309366112 
+ 4.57088189614860e-08  1812.28299005823 
+ 4.89778819368430e-08  1940.96010970603 
+ 5.24807460249755e-08  2078.47972786009 
+ 5.62341325190328e-08  2225.33192078243 
+ 6.02559586074335e-08  2381.98490197540 
+ 6.45654229034631e-08  2548.86068547344 
+ 6.91830970918910e-08  2726.30002073394 
+ 7.41310241300886e-08  2914.51242317302 
+ 7.94328234724248e-08  3113.50565959101 
+ 8.51138038202337e-08  3322.98719244617 
+ 9.12010839355867e-08  3542.22785115252 
+ 9.77237220955765e-08  3769.87552655339 
+ 1.04712854805085e-07  4003.70439951330 
+ 1.12201845430191e-07  4240.28406888031 
+ 1.20226443461735e-07  4474.55482422641 
+ 1.28824955169307e-07  4699.30361904726 
+ 1.38038426460281e-07  4904.55565677498 
+ 1.47910838816813e-07  5076.93718716421 
+ 1.58489319246102e-07  5199.13631077397 
+ 1.69824365246165e-07  5249.69833492077 
+ 1.81970085860987e-07  5203.53561949627 
+ 1.94984459975793e-07  5033.67025549323 
+ 2.08929613085391e-07  4714.76066692175 
+ 2.23872113856820e-07  4228.71320266967 
+ 2.39883291901934e-07  3571.94637312639 
+ 2.57039578276869e-07  2762.62279718622 
+ 2.75422870333798e-07  1844.82457229720 
+ 2.95120922666618e-07  886.263539419481 
+ 3.16227766016816e-07  32.1769012191881 
+ 3.38844156139178e-07  833.008926056978 
+ 3.63078054770075e-07  1459.00068012713 
+ 3.89045144994252e-07  1883.69797162772 
+ 4.16869383470304e-07  2112.11752806422 
+ 4.46683592150928e-07  2173.01204890218 
+ 4.78630092322601e-07  2107.34798949482 
+ 5.12861383991324e-07  1957.70104544234 
+ 5.49540873857579e-07  1761.19972392606 
+ 5.88843655355540e-07  1546.36086548999 
+ 6.30957344480141e-07  1332.81992313363 
+ 6.76082975391924e-07  1132.64513563914 
+ 7.24435960074927e-07  952.196473388731 
+ 7.76247116628624e-07  793.914583485528 
+ 8.31763771102597e-07  657.772793924961 
+ 8.91250938133664e-07  542.338089297798 
+ 9.54992586021348e-07  445.488272081923 
+ 1.02329299228066e-06  364.864841766245 
+ 1.09647819614308e-06  298.139181454333 
+ 1.17489755493942e-06  243.154835139311 
+ 1.25892541179405e-06  197.991826264183 
+ 1.34896288259152e-06  160.984519185187 
+ 1.44543977074578e-06  130.713589434191 
+ 1.54881661891233e-06  105.984979389632 
+ 1.65958690743739e-06  85.8035709167645 
+ 1.77827941003874e-06  69.3459882917777 
+ 1.90546071796305e-06  55.9348656985513 
+ 2.04173794466931e-06  45.0156394594268 
+ 2.18776162394931e-06  36.1361550827094 
+ 2.34422881531967e-06  28.9289192497388 
+ 2.51188643150930e-06  23.0955700477352 
+ 2.69153480392661e-06  18.3930468769427 
+ 2.88403150312628e-06  14.6209993426371 
+ 3.09029543251324e-06  11.6100555788852 
+ 3.31131121482553e-06  9.21019915724122 
+ 3.54813389233533e-06  7.27913948062049 
+ 3.80189396320516e-06  5.71412485976346 
+ 4.07380277804064e-06  4.51591173600697 
+ 4.36515832240112e-06  3.51469116650077 
+ 4.67735141287141e-06  2.61147358576784 
+ 5.01187233627210e-06  1.80148308732185 
+ 5.37031796370184e-06  1.11710989114631 
+ 5.75439937337083e-06  0.601745705808316 
+ 6.16595001861403e-06  0.269044632885760 
+ 6.60693448007509e-06  0.0886352629965147 
+ 7.07945784384044e-06  0.00854394764086125 
+ 7.58577575029083e-06  0.0175073187697312 
+ 8.12830516163990e-06  0.0195511465869850 
+ 8.70963589955962e-06  0.0136571740112636 
+ 9.33254300796864e-06  0.00724957987421045 
+ 1.00000000000000e-05  0.00296884823472930 
diff --git a/kat_test/random/reference/bs_cav_ybeta_misaligned_fsig_xbeta_2.out b/kat_test/random/reference/bs_cav_ybeta_misaligned_fsig_xbeta_2.out
new file mode 100644
index 0000000000000000000000000000000000000000..a1df5e59cf7f64426a6545ea60ced66b296e549f
--- /dev/null
+++ b/kat_test/random/reference/bs_cav_ybeta_misaligned_fsig_xbeta_2.out
@@ -0,0 +1,101 @@
+ 9.99999999999998e-09  397.176599561242 
+ 1.07151930523760e-08  425.580551424507 
+ 1.14815362149688e-08  456.015436796406 
+ 1.23026877081237e-08  488.626361942916 
+ 1.31825673855640e-08  523.568765274415 
+ 1.41253754462274e-08  561.009140627089 
+ 1.51356124843619e-08  601.125806549523 
+ 1.62181009735891e-08  644.109722694154 
+ 1.73780082874936e-08  690.165353627843 
+ 1.86208713666284e-08  739.511579187219 
+ 1.99526231496885e-08  792.382648742627 
+ 2.13796208950220e-08  849.029174160160 
+ 2.29086765276773e-08  909.719152528399 
+ 2.45470891568498e-08  974.739004367041 
+ 2.63026799189533e-08  1044.39460539423 
+ 2.81838293126439e-08  1119.01227905144 
+ 3.01995172040194e-08  1198.93970155020 
+ 3.23593656929620e-08  1284.54664935145 
+ 3.46736850452522e-08  1376.22548810933 
+ 3.71535229097162e-08  1474.39125855519 
+ 3.98107170553486e-08  1579.48115346637 
+ 4.26579518801580e-08  1691.95309366112 
+ 4.57088189614860e-08  1812.28299005823 
+ 4.89778819368430e-08  1940.96010970603 
+ 5.24807460249755e-08  2078.47972786009 
+ 5.62341325190328e-08  2225.33192078243 
+ 6.02559586074335e-08  2381.98490197540 
+ 6.45654229034631e-08  2548.86068547344 
+ 6.91830970918910e-08  2726.30002073394 
+ 7.41310241300886e-08  2914.51242317302 
+ 7.94328234724248e-08  3113.50565959101 
+ 8.51138038202337e-08  3322.98719244617 
+ 9.12010839355867e-08  3542.22785115252 
+ 9.77237220955765e-08  3769.87552655339 
+ 1.04712854805085e-07  4003.70439951330 
+ 1.12201845430191e-07  4240.28406888031 
+ 1.20226443461735e-07  4474.55482422641 
+ 1.28824955169307e-07  4699.30361904726 
+ 1.38038426460281e-07  4904.55565677498 
+ 1.47910838816813e-07  5076.93718716421 
+ 1.58489319246102e-07  5199.13631077397 
+ 1.69824365246165e-07  5249.69833492077 
+ 1.81970085860987e-07  5203.53561949627 
+ 1.94984459975793e-07  5033.67025549323 
+ 2.08929613085391e-07  4714.76066692175 
+ 2.23872113856820e-07  4228.71320266967 
+ 2.39883291901934e-07  3571.94637312639 
+ 2.57039578276869e-07  2762.62279718622 
+ 2.75422870333798e-07  1844.82457229720 
+ 2.95120922666618e-07  886.263539419481 
+ 3.16227766016816e-07  32.1769012191881 
+ 3.38844156139178e-07  833.008926056978 
+ 3.63078054770075e-07  1459.00068012713 
+ 3.89045144994252e-07  1883.69797162772 
+ 4.16869383470304e-07  2112.11752806422 
+ 4.46683592150928e-07  2173.01204890218 
+ 4.78630092322601e-07  2107.34798949482 
+ 5.12861383991324e-07  1957.70104544234 
+ 5.49540873857579e-07  1761.19972392606 
+ 5.88843655355540e-07  1546.36086548999 
+ 6.30957344480141e-07  1332.81992313363 
+ 6.76082975391924e-07  1132.64513563914 
+ 7.24435960074927e-07  952.196473388731 
+ 7.76247116628624e-07  793.914583485528 
+ 8.31763771102597e-07  657.772793924961 
+ 8.91250938133664e-07  542.338089297798 
+ 9.54992586021348e-07  445.488272081923 
+ 1.02329299228066e-06  364.864841766245 
+ 1.09647819614308e-06  298.139181454333 
+ 1.17489755493942e-06  243.154835139311 
+ 1.25892541179405e-06  197.991826264183 
+ 1.34896288259152e-06  160.984519185187 
+ 1.44543977074578e-06  130.713589434191 
+ 1.54881661891233e-06  105.984979389632 
+ 1.65958690743739e-06  85.8035709167645 
+ 1.77827941003874e-06  69.3459882917777 
+ 1.90546071796305e-06  55.9348656985513 
+ 2.04173794466931e-06  45.0156394594268 
+ 2.18776162394931e-06  36.1361550827094 
+ 2.34422881531967e-06  28.9289192497388 
+ 2.51188643150930e-06  23.0955700477352 
+ 2.69153480392661e-06  18.3930468769427 
+ 2.88403150312628e-06  14.6209993426371 
+ 3.09029543251324e-06  11.6100555788852 
+ 3.31131121482553e-06  9.21019915724122 
+ 3.54813389233533e-06  7.27913948062049 
+ 3.80189396320516e-06  5.71412485976346 
+ 4.07380277804064e-06  4.51591173600697 
+ 4.36515832240112e-06  3.51469116650077 
+ 4.67735141287141e-06  2.61147358576784 
+ 5.01187233627210e-06  1.80148308732185 
+ 5.37031796370184e-06  1.11710989114631 
+ 5.75439937337083e-06  0.601745705808316 
+ 6.16595001861403e-06  0.269044632885760 
+ 6.60693448007509e-06  0.0886352629965147 
+ 7.07945784384044e-06  0.00854394764086125 
+ 7.58577575029083e-06  0.0175073187697312 
+ 8.12830516163990e-06  0.0195511465869850 
+ 8.70963589955962e-06  0.0136571740112636 
+ 9.33254300796864e-06  0.00724957987421045 
+ 1.00000000000000e-05  0.00296884823472930 
diff --git a/kat_test/random/reference/bs_cav_ybeta_misaligned_fsig_ybeta_1.out b/kat_test/random/reference/bs_cav_ybeta_misaligned_fsig_ybeta_1.out
new file mode 100644
index 0000000000000000000000000000000000000000..a1df5e59cf7f64426a6545ea60ced66b296e549f
--- /dev/null
+++ b/kat_test/random/reference/bs_cav_ybeta_misaligned_fsig_ybeta_1.out
@@ -0,0 +1,101 @@
+ 9.99999999999998e-09  397.176599561242 
+ 1.07151930523760e-08  425.580551424507 
+ 1.14815362149688e-08  456.015436796406 
+ 1.23026877081237e-08  488.626361942916 
+ 1.31825673855640e-08  523.568765274415 
+ 1.41253754462274e-08  561.009140627089 
+ 1.51356124843619e-08  601.125806549523 
+ 1.62181009735891e-08  644.109722694154 
+ 1.73780082874936e-08  690.165353627843 
+ 1.86208713666284e-08  739.511579187219 
+ 1.99526231496885e-08  792.382648742627 
+ 2.13796208950220e-08  849.029174160160 
+ 2.29086765276773e-08  909.719152528399 
+ 2.45470891568498e-08  974.739004367041 
+ 2.63026799189533e-08  1044.39460539423 
+ 2.81838293126439e-08  1119.01227905144 
+ 3.01995172040194e-08  1198.93970155020 
+ 3.23593656929620e-08  1284.54664935145 
+ 3.46736850452522e-08  1376.22548810933 
+ 3.71535229097162e-08  1474.39125855519 
+ 3.98107170553486e-08  1579.48115346637 
+ 4.26579518801580e-08  1691.95309366112 
+ 4.57088189614860e-08  1812.28299005823 
+ 4.89778819368430e-08  1940.96010970603 
+ 5.24807460249755e-08  2078.47972786009 
+ 5.62341325190328e-08  2225.33192078243 
+ 6.02559586074335e-08  2381.98490197540 
+ 6.45654229034631e-08  2548.86068547344 
+ 6.91830970918910e-08  2726.30002073394 
+ 7.41310241300886e-08  2914.51242317302 
+ 7.94328234724248e-08  3113.50565959101 
+ 8.51138038202337e-08  3322.98719244617 
+ 9.12010839355867e-08  3542.22785115252 
+ 9.77237220955765e-08  3769.87552655339 
+ 1.04712854805085e-07  4003.70439951330 
+ 1.12201845430191e-07  4240.28406888031 
+ 1.20226443461735e-07  4474.55482422641 
+ 1.28824955169307e-07  4699.30361904726 
+ 1.38038426460281e-07  4904.55565677498 
+ 1.47910838816813e-07  5076.93718716421 
+ 1.58489319246102e-07  5199.13631077397 
+ 1.69824365246165e-07  5249.69833492077 
+ 1.81970085860987e-07  5203.53561949627 
+ 1.94984459975793e-07  5033.67025549323 
+ 2.08929613085391e-07  4714.76066692175 
+ 2.23872113856820e-07  4228.71320266967 
+ 2.39883291901934e-07  3571.94637312639 
+ 2.57039578276869e-07  2762.62279718622 
+ 2.75422870333798e-07  1844.82457229720 
+ 2.95120922666618e-07  886.263539419481 
+ 3.16227766016816e-07  32.1769012191881 
+ 3.38844156139178e-07  833.008926056978 
+ 3.63078054770075e-07  1459.00068012713 
+ 3.89045144994252e-07  1883.69797162772 
+ 4.16869383470304e-07  2112.11752806422 
+ 4.46683592150928e-07  2173.01204890218 
+ 4.78630092322601e-07  2107.34798949482 
+ 5.12861383991324e-07  1957.70104544234 
+ 5.49540873857579e-07  1761.19972392606 
+ 5.88843655355540e-07  1546.36086548999 
+ 6.30957344480141e-07  1332.81992313363 
+ 6.76082975391924e-07  1132.64513563914 
+ 7.24435960074927e-07  952.196473388731 
+ 7.76247116628624e-07  793.914583485528 
+ 8.31763771102597e-07  657.772793924961 
+ 8.91250938133664e-07  542.338089297798 
+ 9.54992586021348e-07  445.488272081923 
+ 1.02329299228066e-06  364.864841766245 
+ 1.09647819614308e-06  298.139181454333 
+ 1.17489755493942e-06  243.154835139311 
+ 1.25892541179405e-06  197.991826264183 
+ 1.34896288259152e-06  160.984519185187 
+ 1.44543977074578e-06  130.713589434191 
+ 1.54881661891233e-06  105.984979389632 
+ 1.65958690743739e-06  85.8035709167645 
+ 1.77827941003874e-06  69.3459882917777 
+ 1.90546071796305e-06  55.9348656985513 
+ 2.04173794466931e-06  45.0156394594268 
+ 2.18776162394931e-06  36.1361550827094 
+ 2.34422881531967e-06  28.9289192497388 
+ 2.51188643150930e-06  23.0955700477352 
+ 2.69153480392661e-06  18.3930468769427 
+ 2.88403150312628e-06  14.6209993426371 
+ 3.09029543251324e-06  11.6100555788852 
+ 3.31131121482553e-06  9.21019915724122 
+ 3.54813389233533e-06  7.27913948062049 
+ 3.80189396320516e-06  5.71412485976346 
+ 4.07380277804064e-06  4.51591173600697 
+ 4.36515832240112e-06  3.51469116650077 
+ 4.67735141287141e-06  2.61147358576784 
+ 5.01187233627210e-06  1.80148308732185 
+ 5.37031796370184e-06  1.11710989114631 
+ 5.75439937337083e-06  0.601745705808316 
+ 6.16595001861403e-06  0.269044632885760 
+ 6.60693448007509e-06  0.0886352629965147 
+ 7.07945784384044e-06  0.00854394764086125 
+ 7.58577575029083e-06  0.0175073187697312 
+ 8.12830516163990e-06  0.0195511465869850 
+ 8.70963589955962e-06  0.0136571740112636 
+ 9.33254300796864e-06  0.00724957987421045 
+ 1.00000000000000e-05  0.00296884823472930 
diff --git a/kat_test/random/reference/bs_cav_ybeta_misaligned_fsig_ybeta_2.out b/kat_test/random/reference/bs_cav_ybeta_misaligned_fsig_ybeta_2.out
new file mode 100644
index 0000000000000000000000000000000000000000..a1df5e59cf7f64426a6545ea60ced66b296e549f
--- /dev/null
+++ b/kat_test/random/reference/bs_cav_ybeta_misaligned_fsig_ybeta_2.out
@@ -0,0 +1,101 @@
+ 9.99999999999998e-09  397.176599561242 
+ 1.07151930523760e-08  425.580551424507 
+ 1.14815362149688e-08  456.015436796406 
+ 1.23026877081237e-08  488.626361942916 
+ 1.31825673855640e-08  523.568765274415 
+ 1.41253754462274e-08  561.009140627089 
+ 1.51356124843619e-08  601.125806549523 
+ 1.62181009735891e-08  644.109722694154 
+ 1.73780082874936e-08  690.165353627843 
+ 1.86208713666284e-08  739.511579187219 
+ 1.99526231496885e-08  792.382648742627 
+ 2.13796208950220e-08  849.029174160160 
+ 2.29086765276773e-08  909.719152528399 
+ 2.45470891568498e-08  974.739004367041 
+ 2.63026799189533e-08  1044.39460539423 
+ 2.81838293126439e-08  1119.01227905144 
+ 3.01995172040194e-08  1198.93970155020 
+ 3.23593656929620e-08  1284.54664935145 
+ 3.46736850452522e-08  1376.22548810933 
+ 3.71535229097162e-08  1474.39125855519 
+ 3.98107170553486e-08  1579.48115346637 
+ 4.26579518801580e-08  1691.95309366112 
+ 4.57088189614860e-08  1812.28299005823 
+ 4.89778819368430e-08  1940.96010970603 
+ 5.24807460249755e-08  2078.47972786009 
+ 5.62341325190328e-08  2225.33192078243 
+ 6.02559586074335e-08  2381.98490197540 
+ 6.45654229034631e-08  2548.86068547344 
+ 6.91830970918910e-08  2726.30002073394 
+ 7.41310241300886e-08  2914.51242317302 
+ 7.94328234724248e-08  3113.50565959101 
+ 8.51138038202337e-08  3322.98719244617 
+ 9.12010839355867e-08  3542.22785115252 
+ 9.77237220955765e-08  3769.87552655339 
+ 1.04712854805085e-07  4003.70439951330 
+ 1.12201845430191e-07  4240.28406888031 
+ 1.20226443461735e-07  4474.55482422641 
+ 1.28824955169307e-07  4699.30361904726 
+ 1.38038426460281e-07  4904.55565677498 
+ 1.47910838816813e-07  5076.93718716421 
+ 1.58489319246102e-07  5199.13631077397 
+ 1.69824365246165e-07  5249.69833492077 
+ 1.81970085860987e-07  5203.53561949627 
+ 1.94984459975793e-07  5033.67025549323 
+ 2.08929613085391e-07  4714.76066692175 
+ 2.23872113856820e-07  4228.71320266967 
+ 2.39883291901934e-07  3571.94637312639 
+ 2.57039578276869e-07  2762.62279718622 
+ 2.75422870333798e-07  1844.82457229720 
+ 2.95120922666618e-07  886.263539419481 
+ 3.16227766016816e-07  32.1769012191881 
+ 3.38844156139178e-07  833.008926056978 
+ 3.63078054770075e-07  1459.00068012713 
+ 3.89045144994252e-07  1883.69797162772 
+ 4.16869383470304e-07  2112.11752806422 
+ 4.46683592150928e-07  2173.01204890218 
+ 4.78630092322601e-07  2107.34798949482 
+ 5.12861383991324e-07  1957.70104544234 
+ 5.49540873857579e-07  1761.19972392606 
+ 5.88843655355540e-07  1546.36086548999 
+ 6.30957344480141e-07  1332.81992313363 
+ 6.76082975391924e-07  1132.64513563914 
+ 7.24435960074927e-07  952.196473388731 
+ 7.76247116628624e-07  793.914583485528 
+ 8.31763771102597e-07  657.772793924961 
+ 8.91250938133664e-07  542.338089297798 
+ 9.54992586021348e-07  445.488272081923 
+ 1.02329299228066e-06  364.864841766245 
+ 1.09647819614308e-06  298.139181454333 
+ 1.17489755493942e-06  243.154835139311 
+ 1.25892541179405e-06  197.991826264183 
+ 1.34896288259152e-06  160.984519185187 
+ 1.44543977074578e-06  130.713589434191 
+ 1.54881661891233e-06  105.984979389632 
+ 1.65958690743739e-06  85.8035709167645 
+ 1.77827941003874e-06  69.3459882917777 
+ 1.90546071796305e-06  55.9348656985513 
+ 2.04173794466931e-06  45.0156394594268 
+ 2.18776162394931e-06  36.1361550827094 
+ 2.34422881531967e-06  28.9289192497388 
+ 2.51188643150930e-06  23.0955700477352 
+ 2.69153480392661e-06  18.3930468769427 
+ 2.88403150312628e-06  14.6209993426371 
+ 3.09029543251324e-06  11.6100555788852 
+ 3.31131121482553e-06  9.21019915724122 
+ 3.54813389233533e-06  7.27913948062049 
+ 3.80189396320516e-06  5.71412485976346 
+ 4.07380277804064e-06  4.51591173600697 
+ 4.36515832240112e-06  3.51469116650077 
+ 4.67735141287141e-06  2.61147358576784 
+ 5.01187233627210e-06  1.80148308732185 
+ 5.37031796370184e-06  1.11710989114631 
+ 5.75439937337083e-06  0.601745705808316 
+ 6.16595001861403e-06  0.269044632885760 
+ 6.60693448007509e-06  0.0886352629965147 
+ 7.07945784384044e-06  0.00854394764086125 
+ 7.58577575029083e-06  0.0175073187697312 
+ 8.12830516163990e-06  0.0195511465869850 
+ 8.70963589955962e-06  0.0136571740112636 
+ 9.33254300796864e-06  0.00724957987421045 
+ 1.00000000000000e-05  0.00296884823472930