Merge "Move shared logic to base scenario test class"