Add required validations. Add new test