Ported r7099, r7100, r7101, r7103 and r7104 to the consistency tests code.
Authored by: semor 2008-08-12
Parent: [r7189]
Child: [r7191]
