Follow-up to r4536, fix unit tests. Also took this opportunity to clean up that file which apparently contained 3 times the same content...
Authored by: cboos 2007-01-10
Parent: [r4538]
Child: [r4540]
