Testing: minor cleanup and a FAILING testcase for a future commit.
Authored by: ecarter 2007-07-27
Parent: [r5877]
Child: [r5879]