Add test for handling of `and` with conditionals in `Validator`