A series of minor validator test changes

See linked bugs for details, if necessary.