additional configuration options for scenario tests

Change-Id: I0f3e88d4322fecc83721e1e192e14d617281a3ef
3 files changed