Re: Fix our waveout tests by adjusting for underrun conditions