Refactor before_save callback
Update test include further email format validation