Fix and UT fix to user deletion
Code review markups