use new wrapper in fwave test