The primary objective of the study is to assess whether an improved MSF HIV diagnostic algorithm which includes a simple and easy to perform confirmation test has significantly better positive predictive value than WHO recommended RDT testing algorithms that do not include confirmatory testing.