Steve,
By failing the magnet test I presume you mean the magnet stuck. As I recall the water filler hatch on the earlier tenders was oval. On the later tenders it is round.
Believe me it really pains me to say this but: even though the wheels on your pilot truck are still good, be prepared for their eventual replacement. Look at the pilot wheels on Chris' pilot truck.
Don