simplify waveform logic and tests
Merge pull request #67 from PRX/chore/cleanups

simplify waveform logic and tests