Merge "Fix test "delete2.cpp" to check saved==p only once"