Fix tests that break unnecessarily for avr.