Add validations and update controller test accordingly