Fix unit tests after the vulnerability fixes (#1695)

Fix unit tests after the vulnerability fixes (#1695) #5493