Addressing Population Heterogeneity for HIV Incidence Estimation Based on Recency Test