Huy's Test Update