fix tests for patient builder due to change in value set structure