Unit Test Updates

Updated the HV unit tests to account for changes in the system.