Make validity test more explicit
Use random_waveform for a few more tests