Refactored the Waveform test constructors, added the additional base
class constructors that were being used.