Day 21 Testing

Hana

So my Dr. wants me to come in for day 21 progesterone tests/ultrasound. She told me to come in 7 days before my expected period but from everything I’ve read it sounds like I should go 7dpo? I’m getting tested because my cycles have been short/irregular since my miscarriage so I don’t know exactly when my next period would be and I ovulated later than usual this cycle according to opks (cd18). I also think my luteal phase is short so 7 days until my next period is not the same amount of days post ovulation. Just not sure when I should go in. Anyone have advice/experience?