Merge "Update unit tests for forward delete" into oc-dev