Merge "Stop depending on scenario test base class"