I'd get a cheap electric pump... pump 5 gallons at a clip and burn it in whatever vehicle I have laying around. If it doesn't smell like crap it'll still run and 5 gallons in a 20 gallon tank won't screw you.... just a thought.
When you ran the test tank, did you bypass the fuel filter head...