Minor adjustments.
Add build rule for test-wave.