Updating validations and tests