Corrected HIV test spelling and fixed bug in workplan by test which got the test names from the wrong place

https://www.pivotaltracker.com/story/show/68299748
Merge pull request #311 from pfschwartz/develop

Corrected HIV test spelling and fixed bug in workplan by test which got ...