Re: wave tests patch