Improve custom validations tests