Summary: Update for files that have been modified starting July 2008
Reviewed-by: ohair, tbell

Summary: Fixed the race condition in the test.
Reviewed-by: jjh