Changes to the consistency tests code to reflect the model-free changes of r5220.
These changes are similar to those made to the J(w) mapping code in r5223.
Authored by: semor 2008-04-01
Parent: [r5243]
Child: [r5245]
