diff --git a/public/testbox/system/stubs/139184C0543CCDB338AEFB643110CB89.cfm b/public/testbox/system/stubs/139184C0543CCDB338AEFB643110CB89.cfm
deleted file mode 100644
index d313ccd44c..0000000000
--- a/public/testbox/system/stubs/139184C0543CCDB338AEFB643110CB89.cfm
+++ /dev/null
@@ -1,52 +0,0 @@
-<cfscript>
-			variables[ "closeSSEStream" ] = variables[ "tmp_closeSSEStream_139184C0543CCDB338AEFB643110CB89" ];
-			this[ "closeSSEStream" ]           = variables[ "tmp_closeSSEStream_139184C0543CCDB338AEFB643110CB89" ];
-
-			// Clean up
-			structDelete( variables, "tmp_closeSSEStream_139184C0543CCDB338AEFB643110CB89" );
-			structDelete( this, "tmp_closeSSEStream_139184C0543CCDB338AEFB643110CB89" );
-			public void function tmp_closeSSEStream_139184C0543CCDB338AEFB643110CB89( 
-
-			) output=true {
- 
-			var results                 = this._mockResults;
-			var resultsKey           = "closeSSEStream";
-			var resultsCounter   = 0;
-			var internalCounter = 0;
-			var resultsLen           = 0;
-			var callbackLen         = 0;
-			var argsHashKey         = resultsKey & "|" & this.mockBox.normalizeArguments( arguments );
-			var fCallBack             = "";
-
-			// If Method & argument Hash Results, switch the results struct
-if (structKeyExists( this._mockArgResults, argsHashKey) ) {
-										// Check if it is a callback
-if (isStruct( this._mockArgResults[ argsHashKey ]) &&
-												structKeyExists( this._mockArgResults[ argsHashKey ], "type" ) &&
-												structKeyExists( this._mockArgResults[ argsHashKey ], "target" ) ) {
-																	fCallBack = this._mockArgResults[ argsHashKey ].target;
-} else {
-																	// switch context and key
-																	results       = this._mockArgResults;
-																	resultsKey = argsHashKey;
-										}
-			}
-
-			// Get the statemachine counter
-if (isSimpleValue( fCallBack) ) {
-										resultsLen = arrayLen( results[ resultsKey ] );
-			}
-
-			// Get the callback counter, if it exists
-if (structKeyExists( this._mockCallbacks, resultsKey) ) {
-										callbackLen = arrayLen( this._mockCallbacks[ resultsKey ] );
-			}
-
-			// Log the Method Call
-			this._mockMethodCallCounters[ listFirst( resultsKey, "|" ) ] = this._mockMethodCallCounters[ listFirst( resultsKey, "|" ) ] + 1;
-
-			// Get the CallCounter Reference
-			internalCounter = this._mockMethodCallCounters[listFirst(resultsKey,"|")];
-			arrayAppend( this._mockCallLoggers["closeSSEStream"], arguments );
-}
-</cfscript>
\ No newline at end of file
diff --git a/public/testbox/system/stubs/16CA394252B074478BEBD2B3A9C8EA82.cfm b/public/testbox/system/stubs/16CA394252B074478BEBD2B3A9C8EA82.cfm
deleted file mode 100644
index b7e93ee8ab..0000000000
--- a/public/testbox/system/stubs/16CA394252B074478BEBD2B3A9C8EA82.cfm
+++ /dev/null
@@ -1,52 +0,0 @@
-<cfscript>
-			variables[ "sendSSEComment" ] = variables[ "tmp_sendSSEComment_16CA394252B074478BEBD2B3A9C8EA82" ];
-			this[ "sendSSEComment" ]           = variables[ "tmp_sendSSEComment_16CA394252B074478BEBD2B3A9C8EA82" ];
-
-			// Clean up
-			structDelete( variables, "tmp_sendSSEComment_16CA394252B074478BEBD2B3A9C8EA82" );
-			structDelete( this, "tmp_sendSSEComment_16CA394252B074478BEBD2B3A9C8EA82" );
-			public void function tmp_sendSSEComment_16CA394252B074478BEBD2B3A9C8EA82( 
-
-			) output=true {
- 
-			var results                 = this._mockResults;
-			var resultsKey           = "sendSSEComment";
-			var resultsCounter   = 0;
-			var internalCounter = 0;
-			var resultsLen           = 0;
-			var callbackLen         = 0;
-			var argsHashKey         = resultsKey & "|" & this.mockBox.normalizeArguments( arguments );
-			var fCallBack             = "";
-
-			// If Method & argument Hash Results, switch the results struct
-if (structKeyExists( this._mockArgResults, argsHashKey) ) {
-										// Check if it is a callback
-if (isStruct( this._mockArgResults[ argsHashKey ]) &&
-												structKeyExists( this._mockArgResults[ argsHashKey ], "type" ) &&
-												structKeyExists( this._mockArgResults[ argsHashKey ], "target" ) ) {
-																	fCallBack = this._mockArgResults[ argsHashKey ].target;
-} else {
-																	// switch context and key
-																	results       = this._mockArgResults;
-																	resultsKey = argsHashKey;
-										}
-			}
-
-			// Get the statemachine counter
-if (isSimpleValue( fCallBack) ) {
-										resultsLen = arrayLen( results[ resultsKey ] );
-			}
-
-			// Get the callback counter, if it exists
-if (structKeyExists( this._mockCallbacks, resultsKey) ) {
-										callbackLen = arrayLen( this._mockCallbacks[ resultsKey ] );
-			}
-
-			// Log the Method Call
-			this._mockMethodCallCounters[ listFirst( resultsKey, "|" ) ] = this._mockMethodCallCounters[ listFirst( resultsKey, "|" ) ] + 1;
-
-			// Get the CallCounter Reference
-			internalCounter = this._mockMethodCallCounters[listFirst(resultsKey,"|")];
-			arrayAppend( this._mockCallLoggers["sendSSEComment"], arguments );
-}
-</cfscript>
\ No newline at end of file
diff --git a/public/testbox/system/stubs/30942F4D0BCB6139072EF27C66218715.cfm b/public/testbox/system/stubs/30942F4D0BCB6139072EF27C66218715.cfm
deleted file mode 100644
index e0cfd43b5c..0000000000
--- a/public/testbox/system/stubs/30942F4D0BCB6139072EF27C66218715.cfm
+++ /dev/null
@@ -1,70 +0,0 @@
-<cfscript>
-			variables[ "checkError" ] = variables[ "tmp_checkError_30942F4D0BCB6139072EF27C66218715" ];
-			this[ "checkError" ]           = variables[ "tmp_checkError_30942F4D0BCB6139072EF27C66218715" ];
-
-			// Clean up
-			structDelete( variables, "tmp_checkError_30942F4D0BCB6139072EF27C66218715" );
-			structDelete( this, "tmp_checkError_30942F4D0BCB6139072EF27C66218715" );
-			public any function tmp_checkError_30942F4D0BCB6139072EF27C66218715( 
-
-			) output=true {
- 
-			var results                 = this._mockResults;
-			var resultsKey           = "checkError";
-			var resultsCounter   = 0;
-			var internalCounter = 0;
-			var resultsLen           = 0;
-			var callbackLen         = 0;
-			var argsHashKey         = resultsKey & "|" & this.mockBox.normalizeArguments( arguments );
-			var fCallBack             = "";
-
-			// If Method & argument Hash Results, switch the results struct
-if (structKeyExists( this._mockArgResults, argsHashKey) ) {
-										// Check if it is a callback
-if (isStruct( this._mockArgResults[ argsHashKey ]) &&
-												structKeyExists( this._mockArgResults[ argsHashKey ], "type" ) &&
-												structKeyExists( this._mockArgResults[ argsHashKey ], "target" ) ) {
-																	fCallBack = this._mockArgResults[ argsHashKey ].target;
-} else {
-																	// switch context and key
-																	results       = this._mockArgResults;
-																	resultsKey = argsHashKey;
-										}
-			}
-
-			// Get the statemachine counter
-if (isSimpleValue( fCallBack) ) {
-										resultsLen = arrayLen( results[ resultsKey ] );
-			}
-
-			// Get the callback counter, if it exists
-if (structKeyExists( this._mockCallbacks, resultsKey) ) {
-										callbackLen = arrayLen( this._mockCallbacks[ resultsKey ] );
-			}
-
-			// Log the Method Call
-			this._mockMethodCallCounters[ listFirst( resultsKey, "|" ) ] = this._mockMethodCallCounters[ listFirst( resultsKey, "|" ) ] + 1;
-
-			// Get the CallCounter Reference
-			internalCounter = this._mockMethodCallCounters[listFirst(resultsKey,"|")];
-			arrayAppend( this._mockCallLoggers["checkError"], arguments );
-
-					if (resultsLen neq 0) {
-						if (internalCounter gt resultsLen) {
-							resultsCounter = internalCounter - ( resultsLen * fix( ( internalCounter - 1 ) / resultsLen ) );
-							return results[ resultsKey ][ resultsCounter ];
-						} else {
-							return results[ resultsKey ][ internalCounter ];
-						}
-					}
-					
-					if ( callbackLen neq 0 ) {
-						fCallBack = this._mockCallbacks[ resultsKey ].first();
-						return fCallBack( argumentCollection : arguments );
-					}
-					
-					if ( not isSimpleValue( fCallBack ) ){
-						return fCallBack( argumentCollection : arguments );
-					}
-				}
-</cfscript>
\ No newline at end of file
diff --git a/public/testbox/system/stubs/754BEF48E30B63BC11E518FA73C07785.cfm b/public/testbox/system/stubs/754BEF48E30B63BC11E518FA73C07785.cfm
deleted file mode 100644
index 2ea84360a3..0000000000
--- a/public/testbox/system/stubs/754BEF48E30B63BC11E518FA73C07785.cfm
+++ /dev/null
@@ -1,52 +0,0 @@
-<cfscript>
-			variables[ "sendSSEEvent" ] = variables[ "tmp_sendSSEEvent_754BEF48E30B63BC11E518FA73C07785" ];
-			this[ "sendSSEEvent" ]           = variables[ "tmp_sendSSEEvent_754BEF48E30B63BC11E518FA73C07785" ];
-
-			// Clean up
-			structDelete( variables, "tmp_sendSSEEvent_754BEF48E30B63BC11E518FA73C07785" );
-			structDelete( this, "tmp_sendSSEEvent_754BEF48E30B63BC11E518FA73C07785" );
-			public void function tmp_sendSSEEvent_754BEF48E30B63BC11E518FA73C07785( 
-
-			) output=true {
- 
-			var results                 = this._mockResults;
-			var resultsKey           = "sendSSEEvent";
-			var resultsCounter   = 0;
-			var internalCounter = 0;
-			var resultsLen           = 0;
-			var callbackLen         = 0;
-			var argsHashKey         = resultsKey & "|" & this.mockBox.normalizeArguments( arguments );
-			var fCallBack             = "";
-
-			// If Method & argument Hash Results, switch the results struct
-if (structKeyExists( this._mockArgResults, argsHashKey) ) {
-										// Check if it is a callback
-if (isStruct( this._mockArgResults[ argsHashKey ]) &&
-												structKeyExists( this._mockArgResults[ argsHashKey ], "type" ) &&
-												structKeyExists( this._mockArgResults[ argsHashKey ], "target" ) ) {
-																	fCallBack = this._mockArgResults[ argsHashKey ].target;
-} else {
-																	// switch context and key
-																	results       = this._mockArgResults;
-																	resultsKey = argsHashKey;
-										}
-			}
-
-			// Get the statemachine counter
-if (isSimpleValue( fCallBack) ) {
-										resultsLen = arrayLen( results[ resultsKey ] );
-			}
-
-			// Get the callback counter, if it exists
-if (structKeyExists( this._mockCallbacks, resultsKey) ) {
-										callbackLen = arrayLen( this._mockCallbacks[ resultsKey ] );
-			}
-
-			// Log the Method Call
-			this._mockMethodCallCounters[ listFirst( resultsKey, "|" ) ] = this._mockMethodCallCounters[ listFirst( resultsKey, "|" ) ] + 1;
-
-			// Get the CallCounter Reference
-			internalCounter = this._mockMethodCallCounters[listFirst(resultsKey,"|")];
-			arrayAppend( this._mockCallLoggers["sendSSEEvent"], arguments );
-}
-</cfscript>
\ No newline at end of file
diff --git a/public/testbox/system/stubs/B7681C49C5125395612F24D97559A4C2.cfm b/public/testbox/system/stubs/B7681C49C5125395612F24D97559A4C2.cfm
deleted file mode 100644
index 81f5d1340b..0000000000
--- a/public/testbox/system/stubs/B7681C49C5125395612F24D97559A4C2.cfm
+++ /dev/null
@@ -1,70 +0,0 @@
-<cfscript>
-			variables[ "initSSEStream" ] = variables[ "tmp_initSSEStream_B7681C49C5125395612F24D97559A4C2" ];
-			this[ "initSSEStream" ]           = variables[ "tmp_initSSEStream_B7681C49C5125395612F24D97559A4C2" ];
-
-			// Clean up
-			structDelete( variables, "tmp_initSSEStream_B7681C49C5125395612F24D97559A4C2" );
-			structDelete( this, "tmp_initSSEStream_B7681C49C5125395612F24D97559A4C2" );
-			public any function tmp_initSSEStream_B7681C49C5125395612F24D97559A4C2( 
-
-			) output=true {
- 
-			var results                 = this._mockResults;
-			var resultsKey           = "initSSEStream";
-			var resultsCounter   = 0;
-			var internalCounter = 0;
-			var resultsLen           = 0;
-			var callbackLen         = 0;
-			var argsHashKey         = resultsKey & "|" & this.mockBox.normalizeArguments( arguments );
-			var fCallBack             = "";
-
-			// If Method & argument Hash Results, switch the results struct
-if (structKeyExists( this._mockArgResults, argsHashKey) ) {
-										// Check if it is a callback
-if (isStruct( this._mockArgResults[ argsHashKey ]) &&
-												structKeyExists( this._mockArgResults[ argsHashKey ], "type" ) &&
-												structKeyExists( this._mockArgResults[ argsHashKey ], "target" ) ) {
-																	fCallBack = this._mockArgResults[ argsHashKey ].target;
-} else {
-																	// switch context and key
-																	results       = this._mockArgResults;
-																	resultsKey = argsHashKey;
-										}
-			}
-
-			// Get the statemachine counter
-if (isSimpleValue( fCallBack) ) {
-										resultsLen = arrayLen( results[ resultsKey ] );
-			}
-
-			// Get the callback counter, if it exists
-if (structKeyExists( this._mockCallbacks, resultsKey) ) {
-										callbackLen = arrayLen( this._mockCallbacks[ resultsKey ] );
-			}
-
-			// Log the Method Call
-			this._mockMethodCallCounters[ listFirst( resultsKey, "|" ) ] = this._mockMethodCallCounters[ listFirst( resultsKey, "|" ) ] + 1;
-
-			// Get the CallCounter Reference
-			internalCounter = this._mockMethodCallCounters[listFirst(resultsKey,"|")];
-			arrayAppend( this._mockCallLoggers["initSSEStream"], arguments );
-
-					if (resultsLen neq 0) {
-						if (internalCounter gt resultsLen) {
-							resultsCounter = internalCounter - ( resultsLen * fix( ( internalCounter - 1 ) / resultsLen ) );
-							return results[ resultsKey ][ resultsCounter ];
-						} else {
-							return results[ resultsKey ][ internalCounter ];
-						}
-					}
-					
-					if ( callbackLen neq 0 ) {
-						fCallBack = this._mockCallbacks[ resultsKey ].first();
-						return fCallBack( argumentCollection : arguments );
-					}
-					
-					if ( not isSimpleValue( fCallBack ) ){
-						return fCallBack( argumentCollection : arguments );
-					}
-				}
-</cfscript>
\ No newline at end of file
diff --git a/public/testbox/system/stubs/C383511C024245809F1F73E0CA52E220.cfm b/public/testbox/system/stubs/C383511C024245809F1F73E0CA52E220.cfm
deleted file mode 100644
index 968526a2a3..0000000000
--- a/public/testbox/system/stubs/C383511C024245809F1F73E0CA52E220.cfm
+++ /dev/null
@@ -1,70 +0,0 @@
-<cfscript>
-			variables[ "poll" ] = variables[ "tmp_poll_C383511C024245809F1F73E0CA52E220" ];
-			this[ "poll" ]           = variables[ "tmp_poll_C383511C024245809F1F73E0CA52E220" ];
-
-			// Clean up
-			structDelete( variables, "tmp_poll_C383511C024245809F1F73E0CA52E220" );
-			structDelete( this, "tmp_poll_C383511C024245809F1F73E0CA52E220" );
-			public any function tmp_poll_C383511C024245809F1F73E0CA52E220( 
-
-			) output=true {
- 
-			var results                 = this._mockResults;
-			var resultsKey           = "poll";
-			var resultsCounter   = 0;
-			var internalCounter = 0;
-			var resultsLen           = 0;
-			var callbackLen         = 0;
-			var argsHashKey         = resultsKey & "|" & this.mockBox.normalizeArguments( arguments );
-			var fCallBack             = "";
-
-			// If Method & argument Hash Results, switch the results struct
-if (structKeyExists( this._mockArgResults, argsHashKey) ) {
-										// Check if it is a callback
-if (isStruct( this._mockArgResults[ argsHashKey ]) &&
-												structKeyExists( this._mockArgResults[ argsHashKey ], "type" ) &&
-												structKeyExists( this._mockArgResults[ argsHashKey ], "target" ) ) {
-																	fCallBack = this._mockArgResults[ argsHashKey ].target;
-} else {
-																	// switch context and key
-																	results       = this._mockArgResults;
-																	resultsKey = argsHashKey;
-										}
-			}
-
-			// Get the statemachine counter
-if (isSimpleValue( fCallBack) ) {
-										resultsLen = arrayLen( results[ resultsKey ] );
-			}
-
-			// Get the callback counter, if it exists
-if (structKeyExists( this._mockCallbacks, resultsKey) ) {
-										callbackLen = arrayLen( this._mockCallbacks[ resultsKey ] );
-			}
-
-			// Log the Method Call
-			this._mockMethodCallCounters[ listFirst( resultsKey, "|" ) ] = this._mockMethodCallCounters[ listFirst( resultsKey, "|" ) ] + 1;
-
-			// Get the CallCounter Reference
-			internalCounter = this._mockMethodCallCounters[listFirst(resultsKey,"|")];
-			arrayAppend( this._mockCallLoggers["poll"], arguments );
-
-					if (resultsLen neq 0) {
-						if (internalCounter gt resultsLen) {
-							resultsCounter = internalCounter - ( resultsLen * fix( ( internalCounter - 1 ) / resultsLen ) );
-							return results[ resultsKey ][ resultsCounter ];
-						} else {
-							return results[ resultsKey ][ internalCounter ];
-						}
-					}
-					
-					if ( callbackLen neq 0 ) {
-						fCallBack = this._mockCallbacks[ resultsKey ].first();
-						return fCallBack( argumentCollection : arguments );
-					}
-					
-					if ( not isSimpleValue( fCallBack ) ){
-						return fCallBack( argumentCollection : arguments );
-					}
-				}
-</cfscript>
\ No newline at end of file
diff --git a/public/testbox/system/stubs/CDCB73D6FD17909D6519A49548FD6769.cfm b/public/testbox/system/stubs/CDCB73D6FD17909D6519A49548FD6769.cfm
deleted file mode 100644
index f7f4f1f167..0000000000
--- a/public/testbox/system/stubs/CDCB73D6FD17909D6519A49548FD6769.cfm
+++ /dev/null
@@ -1,70 +0,0 @@
-<cfscript>
-			variables[ "$getChannelEngine" ] = variables[ "tmp_$getChannelEngine_CDCB73D6FD17909D6519A49548FD6769" ];
-			this[ "$getChannelEngine" ]           = variables[ "tmp_$getChannelEngine_CDCB73D6FD17909D6519A49548FD6769" ];
-
-			// Clean up
-			structDelete( variables, "tmp_$getChannelEngine_CDCB73D6FD17909D6519A49548FD6769" );
-			structDelete( this, "tmp_$getChannelEngine_CDCB73D6FD17909D6519A49548FD6769" );
-			public any function tmp_$getChannelEngine_CDCB73D6FD17909D6519A49548FD6769( 
-
-			) output=true {
- 
-			var results                 = this._mockResults;
-			var resultsKey           = "$getChannelEngine";
-			var resultsCounter   = 0;
-			var internalCounter = 0;
-			var resultsLen           = 0;
-			var callbackLen         = 0;
-			var argsHashKey         = resultsKey & "|" & this.mockBox.normalizeArguments( arguments );
-			var fCallBack             = "";
-
-			// If Method & argument Hash Results, switch the results struct
-if (structKeyExists( this._mockArgResults, argsHashKey) ) {
-										// Check if it is a callback
-if (isStruct( this._mockArgResults[ argsHashKey ]) &&
-												structKeyExists( this._mockArgResults[ argsHashKey ], "type" ) &&
-												structKeyExists( this._mockArgResults[ argsHashKey ], "target" ) ) {
-																	fCallBack = this._mockArgResults[ argsHashKey ].target;
-} else {
-																	// switch context and key
-																	results       = this._mockArgResults;
-																	resultsKey = argsHashKey;
-										}
-			}
-
-			// Get the statemachine counter
-if (isSimpleValue( fCallBack) ) {
-										resultsLen = arrayLen( results[ resultsKey ] );
-			}
-
-			// Get the callback counter, if it exists
-if (structKeyExists( this._mockCallbacks, resultsKey) ) {
-										callbackLen = arrayLen( this._mockCallbacks[ resultsKey ] );
-			}
-
-			// Log the Method Call
-			this._mockMethodCallCounters[ listFirst( resultsKey, "|" ) ] = this._mockMethodCallCounters[ listFirst( resultsKey, "|" ) ] + 1;
-
-			// Get the CallCounter Reference
-			internalCounter = this._mockMethodCallCounters[listFirst(resultsKey,"|")];
-			arrayAppend( this._mockCallLoggers["$getChannelEngine"], arguments );
-
-					if (resultsLen neq 0) {
-						if (internalCounter gt resultsLen) {
-							resultsCounter = internalCounter - ( resultsLen * fix( ( internalCounter - 1 ) / resultsLen ) );
-							return results[ resultsKey ][ resultsCounter ];
-						} else {
-							return results[ resultsKey ][ internalCounter ];
-						}
-					}
-					
-					if ( callbackLen neq 0 ) {
-						fCallBack = this._mockCallbacks[ resultsKey ].first();
-						return fCallBack( argumentCollection : arguments );
-					}
-					
-					if ( not isSimpleValue( fCallBack ) ){
-						return fCallBack( argumentCollection : arguments );
-					}
-				}
-</cfscript>
\ No newline at end of file