Fixed the unit-test affected by r7393 and also fix a few typos from r7291.
Authored by: cboos 2008-07-25
Parent: [r7393]
Child: [r7395]