test_basic_scenario minor modifications