Revive two validation suites that had never run (#1554)