Many improvements to included waveTank test case