In 85e8e624, these tests were modified to work with AVR, but the regex matchers were finicky and required a fix forward patch, being this.