HHH-7478 - Fix and test
HHH-7478 Corrected test