Migrate scenario tests to resource_* fixtures

Partially-implements bp resource-cleanup

Change-Id: Ib6ad8614c6d1a84e32dd31d27f899df02eed260a
Merge "Migrate scenario tests to resource_* fixtures"