Fixes tests. Add test_scenario code