Congratulations, sounds like your distributor is working properly, you have to temporarily remove the advance hose for the speed test as you have already discovered, with it on it can exceed 40 degrees.
Now if you want to save time at Duanes test your fuel pressure and the OHMs of the TS2, Bentley or Ratwell have all the details on how.