diff --git a/public/test/core/redux/reducerTester.ts b/public/test/core/redux/reducerTester.ts
index 08fe298a399..be41c8e4df9 100644
--- a/public/test/core/redux/reducerTester.ts
+++ b/public/test/core/redux/reducerTester.ts
@@ -1,9 +1,10 @@
 import { Reducer } from 'redux';
-import { PayloadAction } from '@reduxjs/toolkit';
+import { PayloadAction, Action } from '@reduxjs/toolkit';
+import { cloneDeep } from 'lodash';
 
 export interface Given<State> {
   givenReducer: (
-    reducer: Reducer<State, PayloadAction<any>>,
+    reducer: Reducer<State, PayloadAction<any> | Action<any>>,
     state: State,
     showDebugOutput?: boolean,
     disableDeepFreeze?: boolean
@@ -11,7 +12,7 @@ export interface Given<State> {
 }
 
 export interface When<State> {
-  whenActionIsDispatched: (action: PayloadAction<any>) => Then<State>;
+  whenActionIsDispatched: (action: PayloadAction<any> | Action<any>) => Then<State>;
 }
 
 export interface Then<State> {
@@ -66,9 +67,9 @@ export const reducerTester = <State>(): Given<State> => {
     disableDeepFreeze = false
   ): When<State> => {
     reducerUnderTest = reducer;
-    initialState = { ...state };
-    if (!disableDeepFreeze) {
-      initialState = deepFreeze(initialState);
+    initialState = cloneDeep(state);
+    if (!disableDeepFreeze && (typeof state === 'object' || typeof state === 'function')) {
+      deepFreeze(initialState);
     }
     showDebugOutput = debug;