Converted the arguments into keyword arguments to try to fix these unit tests.
Authored by: bugman 2007-11-20
Parent: [r3748]
Child: [r3750]
