HV-740 Updating tests