Added ScenarioSelector class w/ tests