More changes to the consistency tests code to reflect the model-free changes of r5220...
Authored by: semor 2008-04-01
Parent: [r5244]
Child: [r5246]