Moving functional tests to Commands.ScenarioTests