Partially fixed more code so the consistency tests system test can go further before failure...
Authored by: semor 2008-04-04
Parent: [r5320]
Child: [r5322]
