changes to hdi tests as requested by Salvo