Merge "Fixed issues found in delete integration testing"