Added more tests and validations to Contact