Updated tests for wave form related classes, and bug fixes.