Continued the shifting of the consistency tests code to the new relax design started at r4583.
Authored by: semor 2008-01-11
Parent: [r4649]
Child: [r4651]