Add test for handling of `and` with conditionals in `Validator`
Merge pull request #300 from lexmag/more-validator-tests

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