Test cases of deletion written refactoring not done
Refactoring of delete is done little bit