Improved validations in model Holiday and tests