Restore tests deleted during merge