im not quite sure what a leakdown test is. ive been told that the pump cannot be replaced by itself rather the whole unit needs to be replaced. a friend suggested that the o2 sensor may need to be replaced and could cause this problem. can anyone confirm/deny this?
I replaced the fuel pump on my YJ in about 3 hours, and it was not so expensive (mine was around $110 with shipping included). The only real PITA is dropping the tank, but I did it by myself with some help from the wife. No rocket science involved!
As for the O2 sensor, I understand that the TJ has 2 of them (not sure, though, as there is only 1 in the YJ). I replaced mine (about 5 minutes) with a new one (Bosch, about $45). This one is really a piece of cake, so if you think the O2 sensor is at fault (it does not sound so to me, but that is your call) I would replace it.
By the way, I am getting 15 mpg on 31" tires on my 2.5L YJ if it helps any...
Felipe