Merge "update scenario and related unittest"