Validator tests improved and expanded.
[#83488538]