Advocates urge rethink on HIV tests