Expand coverage of patient builder tests