HHH-8401 : Unit test fixes

(cherry picked from commit 45511f10ae58e9460fd09e6da5c33b1332494cbf)