It would be good to add a test here for reset, to confirm that the old_state has been unmasked.  This may require doing a save first so there's something to reset.