[Cherry-pick][2.24] Fix Guardrails tests for 2.24

[Cherry-pick][2.24] Fix Guardrails tests for 2.24 #378