fixups to validator tests