Added changes to HRISv2 unit tests