[HVA-3959] more testing, ain't that fine.
Merge pull request #2 from dosheawork/HVA-3959

HVA-3959