almost all of trigger-modifiers tests fixed (3/257 failing for trigger-modifiers, 79/1352 failing for all modifiers)