Cherry picked test cases from New_Edit_Function.