Increasing HIV testing in non-genitourinary settings: a follow-up study in general practice and a new study in a hospital setting.