If you were testing for the masturbation incident you mentioned in herpes, you had ZERO risk for HIV or any STDs. Any test you take at any time will be negative, and conclusive.
The only risks for HIV in adults are:
1) Having unprotected (no condom) penetrative anal or vaginal sex, OR
2) Sharing IV drug equipment with other IV drug users.
You didn't need ANY tests, and you certainly don't need any more tests.