More validators, more tests