Add patientVisit number and improve test workflow.