Add more validator tests