Model of the Effects of Improving TB Diagnosis on Infection Dynamics in Differing Demographic and HIV-Prevalence Scenarios