Merge "Convert scenario test tearDown to addCleanup"