add version 2 of test wavforms