Clean up scenario functions

Some functions in scenario test cases are redundant. This commit cleans
up them.

Change-Id: I91cd48e8f4c5f152b85e7590eb328814ba8015fa
3 files changed