[simeon] added another scenarios and refactored the rest of the @wip scenarios.