Merge "Fixed test-triggerring regexes"