I don't store my lights long enough to know whether the battery self discharges...I haven't used a 2+ cell surefire flashlights that doesn't give me one or more battery that ZTS's at [no click] to 20% and at least one cell that ZTS's 80-100%:green:
Surefire contestants
M6, A2, E2e, E2D, L4
Cells used
Duracell [at least one case experienced in L4]
Surefire [typically 1 out of 3-4 battery changes, could be a bad batch]
Streamlight [typically 1 out of 6 battery changes, I only buy streamlight from now on.]
Energizer [at least one case experienced in A2], I stopped buying energizer due to price increase