Fixed both HIV and TB eligibility calculations to only return patients who are alive
* Added unit tests for this