Merge "Set test_basic_traffic as smoke test"