Restore tests clobbered in rebase.