Modified the unit tests due to the changed of r5220.
Authored by: bugman 2008-03-23
Parent: [r5220]
Child: [r5222]