CD4% included in the determination for due for CD4

This pull request include the inclusion of cd4% in the "Due for cd4 alert", respective tests classes and other minor fixes