Even the month that I ovualted on day 9 (usually ovulate day 12-14) my period still came on day 29, so if it were me, i'd still go by the day I expect my period to come, not by ovulation day.
Ept is done a couple of days before your period is expected right? If so, again, i'd just go by expected period day, not counting from ovulation. It can take some time (anywhere from 3-10 days) for the fertilized egg to implant, and until it does and starts producing hcg, there's nothing to test anyway.