Agree with Simp completely, i covered pretty much everything included in the test within my first 5 lessons, don't think i've even had 10 yet and my test is next month if i can't get an earlier one as a cancellation!
Sounds like you've got the right idea, phone around and tell them what your situation is, get them to make sure you're driving "properly" and then book your test up asap.