Merge "Rework class inheritance for scenario tests"