moved fwave tests into own class