Apart from what you have already suggested, add a "reset win/lose history" action to the trigger that switches the test mode on/off. Also, you can execute this trigger "one time only" at the start of your trading session (in addition to the similar action in the other trigger).