Improve scenarios to reduce duplicate codes