Updated wave-test