Fix tests after merge WAVE changes