Fixed linkage between HctHivTest and PocCd4Test