Glad to here you got on the right track. Hopefully that will be your only problem. But it sounds like you found a good plumber. I agree with him that a second test is the right way to go.

Good Luck
John