A Wal-Mart Multi-meter with needle, (GE yellow model under $15.00), can save many hours of guessing to check electrical continuity in wires.
If your problem is the switch, in the pop-out switch area, Bratton's catalog indicates a diagram of how to test correct switch continuity with a multi-meter.
Many old wires in the switch's armored cable short out.
Metal wire connectors sometimes ground out on the inside of the gas tank.
Many install electrical tape on the inside of the gas tank to prevent shorts.
Again, a simple multi-meter can save many hours of guess work.