Similar to the first version.
I cleaned up the circuit a bit to make it easier to see the flow.
Removed:
one pole of the switch- After looking over the original design I saw that it wasn't needed.
Added:
Power On indicator LED
Fire Mode LED
Diode on the test leg so that test LED will go out in Fire mode.