Improvements to test wav generator.