Changed Flap tests and derive arguments to be multi state.