MVBaseTestScenario refactor