Merge "Switch to local copy of scenario test base class"