HCSVLAB-562__REDO__: Tweaked to make the tests pass