scenarios + FWaveTest modified