Delete functionality, more more more validations & tests