diff --git a/internal/integrationtest/lib/lib_test.go b/internal/integrationtest/lib/lib_test.go
index a09220d04a1..a554da03132 100644
--- a/internal/integrationtest/lib/lib_test.go
+++ b/internal/integrationtest/lib/lib_test.go
@@ -20,14 +20,17 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"runtime"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/arduino/arduino-cli/internal/integrationtest"
 	"github.com/arduino/go-paths-helper"
 	"github.com/stretchr/testify/require"
 	"go.bug.st/testifyjson/requirejson"
 	"gopkg.in/src-d/go-git.v4"
+	"gopkg.in/src-d/go-git.v4/plumbing/object"
 )
 
 func TestLibUpgradeCommand(t *testing.T) {
@@ -1024,3 +1027,449 @@ func TestLibExamplesWithPdeFile(t *testing.T) {
 	require.Contains(t, examples, cli.SketchbookDir().Join("libraries", "Encoder", "examples", "SpeedTest").String())
 	require.Contains(t, examples, cli.SketchbookDir().Join("libraries", "Encoder", "examples", "TwoKnobs").String())
 }
+
+func TestLibExamplesWithCaseMismatch(t *testing.T) {
+	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
+	defer env.CleanUp()
+
+	_, _, err := cli.Run("update")
+	require.NoError(t, err)
+
+	_, _, err = cli.Run("lib", "install", "WiFiManager@2.0.3-alpha")
+	require.NoError(t, err)
+
+	stdout, _, err := cli.Run("lib", "examples", "WiFiManager", "--format", "json")
+	require.NoError(t, err)
+	requirejson.Len(t, stdout, 1)
+	requirejson.Query(t, stdout, ".[0] | .examples | length", "14")
+
+	examples := requirejson.Parse(t, stdout).Query(".[0] | .examples").String()
+	examples = strings.ReplaceAll(examples, "\\\\", "\\")
+	examplesPath := cli.SketchbookDir().Join("libraries", "WiFiManager", "examples")
+	// Verifies sketches with correct casing are listed
+	require.Contains(t, examples, examplesPath.Join("Advanced").String())
+	require.Contains(t, examples, examplesPath.Join("AutoConnect", "AutoConnectWithFeedbackLED").String())
+	require.Contains(t, examples, examplesPath.Join("AutoConnect", "AutoConnectWithFSParameters").String())
+	require.Contains(t, examples, examplesPath.Join("AutoConnect", "AutoConnectWithFSParametersAndCustomIP").String())
+	require.Contains(t, examples, examplesPath.Join("Basic").String())
+	require.Contains(t, examples, examplesPath.Join("DEV", "OnDemandConfigPortal").String())
+	require.Contains(t, examples, examplesPath.Join("NonBlocking", "AutoConnectNonBlocking").String())
+	require.Contains(t, examples, examplesPath.Join("NonBlocking", "AutoConnectNonBlockingwParams").String())
+	require.Contains(t, examples, examplesPath.Join("Old_examples", "AutoConnectWithFeedback").String())
+	require.Contains(t, examples, examplesPath.Join("Old_examples", "AutoConnectWithReset").String())
+	require.Contains(t, examples, examplesPath.Join("Old_examples", "AutoConnectWithStaticIP").String())
+	require.Contains(t, examples, examplesPath.Join("Old_examples", "AutoConnectWithTimeout").String())
+	require.Contains(t, examples, examplesPath.Join("OnDemand", "OnDemandConfigPortal").String())
+	require.Contains(t, examples, examplesPath.Join("ParamsChildClass").String())
+	// Verifies sketches with wrong casing are not returned
+	require.NotContains(t, examples, examplesPath.Join("NonBlocking", "OnDemandNonBlocking").String())
+	require.NotContains(t, examples, examplesPath.Join("OnDemand", "OnDemandWebPortal").String())
+}
+
+func TestLibCommandsWithLibraryHavingInvalidVersion(t *testing.T) {
+	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
+	defer env.CleanUp()
+
+	_, _, err := cli.Run("update")
+	require.NoError(t, err)
+
+	// Install a library
+	_, _, err = cli.Run("lib", "install", "WiFi101@0.16.1")
+	require.NoError(t, err)
+
+	// Verifies library is correctly returned
+	stdout, _, err := cli.Run("lib", "list", "--format", "json")
+	require.NoError(t, err)
+	requirejson.Len(t, stdout, 1)
+	requirejson.Query(t, stdout, ".[0] | .library | .version", `"0.16.1"`)
+
+	// Changes the version of the currently installed library so that it's
+	// invalid
+	libPath := cli.SketchbookDir().Join("libraries", "WiFi101", "library.properties")
+	require.NoError(t, libPath.WriteFile([]byte("name=WiFi101\nversion=1.0001")))
+
+	// Verifies version is now empty
+	stdout, _, err = cli.Run("lib", "list", "--format", "json")
+	require.NoError(t, err)
+	requirejson.Len(t, stdout, 1)
+	requirejson.Query(t, stdout, ".[0] | .library | .version", "null")
+
+	// Upgrade library
+	_, _, err = cli.Run("lib", "upgrade", "WiFi101")
+	require.NoError(t, err)
+
+	// Verifies library has been updated
+	stdout, _, err = cli.Run("lib", "list", "--format", "json")
+	require.NoError(t, err)
+	requirejson.Len(t, stdout, 1)
+	requirejson.Query(t, stdout, ".[0] | .library | .version != \"\"", "true")
+}
+
+func TestInstallZipLibWithMacosMetadata(t *testing.T) {
+	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
+	defer env.CleanUp()
+
+	// Initialize configs to enable --zip-path flag
+	envVar := cli.GetDefaultEnv()
+	envVar["ARDUINO_ENABLE_UNSAFE_LIBRARY_INSTALL"] = "true"
+	_, _, err := cli.RunWithCustomEnv(envVar, "config", "init", "--dest-dir", ".")
+	require.NoError(t, err)
+
+	libInstallDir := cli.SketchbookDir().Join("libraries", "fake-lib")
+	// Verifies library is not already installed
+	require.NoDirExists(t, libInstallDir.String())
+
+	zipPath, err := paths.New("..", "testdata", "fake-lib.zip").Abs()
+	require.NoError(t, err)
+	// Test zip-path install
+	stdout, _, err := cli.Run("lib", "install", "--zip-path", zipPath.String())
+	require.NoError(t, err)
+	require.Contains(t, string(stdout), "--git-url and --zip-path flags allow installing untrusted files, use it at your own risk.")
+
+	// Verifies library is installed in expected path
+	require.DirExists(t, libInstallDir.String())
+	require.FileExists(t, libInstallDir.Join("library.properties").String())
+	require.FileExists(t, libInstallDir.Join("src", "fake-lib.h").String())
+
+	// Reinstall library
+	_, _, err = cli.Run("lib", "install", "--zip-path", zipPath.String())
+	require.NoError(t, err)
+
+	// Verifies library remains installed
+	require.DirExists(t, libInstallDir.String())
+	require.FileExists(t, libInstallDir.Join("library.properties").String())
+	require.FileExists(t, libInstallDir.Join("src", "fake-lib.h").String())
+}
+
+func TestInstallZipInvalidLibrary(t *testing.T) {
+	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
+	defer env.CleanUp()
+
+	// Initialize configs to enable --zip-path flag
+	envVar := cli.GetDefaultEnv()
+	envVar["ARDUINO_ENABLE_UNSAFE_LIBRARY_INSTALL"] = "true"
+	_, _, err := cli.RunWithCustomEnv(envVar, "config", "init", "--dest-dir", ".")
+	require.NoError(t, err)
+
+	libInstallDir := cli.SketchbookDir().Join("libraries", "lib-without-header")
+	// Verifies library is not already installed
+	require.NoDirExists(t, libInstallDir.String())
+
+	zipPath, err := paths.New("..", "testdata", "lib-without-header.zip").Abs()
+	require.NoError(t, err)
+	// Test zip-path install
+	_, stderr, err := cli.Run("lib", "install", "--zip-path", zipPath.String())
+	require.Error(t, err)
+	require.Contains(t, string(stderr), "library not valid")
+
+	libInstallDir = cli.SketchbookDir().Join("libraries", "lib-without-properties")
+	// Verifies library is not already installed
+	require.NoDirExists(t, libInstallDir.String())
+
+	zipPath, err = paths.New("..", "testdata", "lib-without-properties.zip").Abs()
+	require.NoError(t, err)
+	// Test zip-path install
+	_, stderr, err = cli.Run("lib", "install", "--zip-path", zipPath.String())
+	require.Error(t, err)
+	require.Contains(t, string(stderr), "library not valid")
+}
+
+func TestInstallGitInvalidLibrary(t *testing.T) {
+	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
+	defer env.CleanUp()
+
+	// Initialize configs to enable --zip-path flag
+	envVar := cli.GetDefaultEnv()
+	envVar["ARDUINO_ENABLE_UNSAFE_LIBRARY_INSTALL"] = "true"
+	_, _, err := cli.RunWithCustomEnv(envVar, "config", "init", "--dest-dir", ".")
+	require.NoError(t, err)
+
+	// Create fake library repository
+	repoDir := cli.SketchbookDir().Join("lib-without-header")
+	repo, err := git.PlainInit(repoDir.String(), false)
+	require.NoError(t, err)
+	libProperties := repoDir.Join("library.properties")
+	f, err := libProperties.Create()
+	require.NoError(t, err)
+	require.NoError(t, f.Close())
+	tree, err := repo.Worktree()
+	require.NoError(t, err)
+	_, err = tree.Add("library.properties")
+	require.NoError(t, err)
+	_, err = tree.Commit("First commit", &git.CommitOptions{
+		All: false, Author: &object.Signature{Name: "a", Email: "b", When: time.Now()}, Committer: nil, Parents: nil, SignKey: nil})
+	require.NoError(t, err)
+
+	libInstallDir := cli.SketchbookDir().Join("libraries", "lib-without-header")
+	// Verifies library is not already installed
+	require.NoDirExists(t, libInstallDir.String())
+
+	_, stderr, err := cli.RunWithCustomEnv(envVar, "lib", "install", "--git-url", repoDir.String())
+	require.Error(t, err)
+	require.Contains(t, string(stderr), "library not valid")
+	require.NoDirExists(t, libInstallDir.String())
+
+	// Create another fake library repository
+	repoDir = cli.SketchbookDir().Join("lib-without-properties")
+	repo, err = git.PlainInit(repoDir.String(), false)
+	require.NoError(t, err)
+	libHeader := repoDir.Join("src", "lib-without-properties.h")
+	require.NoError(t, libHeader.Parent().MkdirAll())
+	f, err = libHeader.Create()
+	require.NoError(t, err)
+	require.NoError(t, f.Close())
+	tree, err = repo.Worktree()
+	require.NoError(t, err)
+	_, err = tree.Add("src/lib-without-properties.h")
+	require.NoError(t, err)
+	_, err = tree.Commit("First commit", &git.CommitOptions{
+		All: false, Author: &object.Signature{Name: "a", Email: "b", When: time.Now()}, Committer: nil, Parents: nil, SignKey: nil})
+	require.NoError(t, err)
+
+	libInstallDir = cli.SketchbookDir().Join("libraries", "lib-without-properties")
+	// Verifies library is not already installed
+	require.NoDirExists(t, libInstallDir.String())
+
+	_, stderr, err = cli.RunWithCustomEnv(envVar, "lib", "install", "--git-url", repoDir.String())
+	require.Error(t, err)
+	require.Contains(t, string(stderr), "library not valid")
+	require.NoDirExists(t, libInstallDir.String())
+}
+
+func TestUpgradeDoesNotTryToUpgradeBundledCoreLibrariesInSketchbook(t *testing.T) {
+	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
+	defer env.CleanUp()
+
+	testPlatformName := "platform_with_bundled_library"
+	platformInstallDir := cli.SketchbookDir().Join("hardware", "arduino-beta-dev", testPlatformName)
+	require.NoError(t, platformInstallDir.Parent().MkdirAll())
+
+	// Install platform in Sketchbook hardware dir
+	require.NoError(t, paths.New("..", "testdata", testPlatformName).CopyDirTo(platformInstallDir))
+
+	_, _, err := cli.Run("update")
+	require.NoError(t, err)
+
+	// Install latest version of library identical to one
+	// bundled with test platform
+	_, _, err = cli.Run("lib", "install", "USBHost")
+	require.NoError(t, err)
+
+	stdout, _, err := cli.Run("lib", "list", "--all", "--format", "json")
+	require.NoError(t, err)
+	requirejson.Len(t, stdout, 2)
+	// Verify both libraries have the same name
+	requirejson.Query(t, stdout, ".[0] | .library | .name", `"USBHost"`)
+	requirejson.Query(t, stdout, ".[1] | .library | .name", `"USBHost"`)
+
+	stdout, _, err = cli.Run("lib", "upgrade")
+	require.NoError(t, err)
+	// Empty output means nothing has been updated as expected
+	require.Empty(t, stdout)
+}
+
+func TestUpgradeDoesNotTryToUpgradeBundledCoreLibraries(t *testing.T) {
+	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
+	defer env.CleanUp()
+
+	testPlatformName := "platform_with_bundled_library"
+	platformInstallDir := cli.DataDir().Join("packages", "arduino", "hardware", "arch", "4.2.0")
+	require.NoError(t, platformInstallDir.Parent().MkdirAll())
+
+	// Install platform in Sketchbook hardware dir
+	require.NoError(t, paths.New("..", "testdata", testPlatformName).CopyDirTo(platformInstallDir))
+
+	_, _, err := cli.Run("update")
+	require.NoError(t, err)
+
+	// Install latest version of library identical to one
+	// bundled with test platform
+	_, _, err = cli.Run("lib", "install", "USBHost")
+	require.NoError(t, err)
+
+	stdout, _, err := cli.Run("lib", "list", "--all", "--format", "json")
+	require.NoError(t, err)
+	requirejson.Len(t, stdout, 2)
+	// Verify both libraries have the same name
+	requirejson.Query(t, stdout, ".[0] | .library | .name", `"USBHost"`)
+	requirejson.Query(t, stdout, ".[1] | .library | .name", `"USBHost"`)
+
+	stdout, _, err = cli.Run("lib", "upgrade")
+	require.NoError(t, err)
+	// Empty output means nothing has been updated as expected
+	require.Empty(t, stdout)
+}
+
+func downloadLib(t *testing.T, url string, zipPath *paths.Path) {
+	response, err := http.Get(url)
+	require.NoError(t, err)
+	require.Equal(t, response.StatusCode, 200)
+	zip, err := zipPath.Create()
+	require.NoError(t, err)
+	_, err = io.Copy(zip, response.Body)
+	require.NoError(t, err)
+	require.NoError(t, response.Body.Close())
+	require.NoError(t, zip.Close())
+}
+
+func TestInstallGitUrlAndZipPathFlagsVisibility(t *testing.T) {
+	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
+	defer env.CleanUp()
+
+	// Verifies installation fail because flags are not found
+	gitUrl := "https://github.com/arduino-libraries/WiFi101.git"
+	_, stderr, err := cli.Run("lib", "install", "--git-url", gitUrl)
+	require.Error(t, err)
+	require.Contains(t, string(stderr), "--git-url and --zip-path are disabled by default, for more information see:")
+
+	// Download library
+	url := "https://github.com/arduino-libraries/AudioZero/archive/refs/tags/1.1.1.zip"
+	zipPath := cli.DownloadDir().Join("libraries", "AudioZero.zip")
+	require.NoError(t, zipPath.Parent().MkdirAll())
+	downloadLib(t, url, zipPath)
+
+	_, stderr, err = cli.Run("lib", "install", "--zip-path", zipPath.String())
+	require.Error(t, err)
+	require.Contains(t, string(stderr), "--git-url and --zip-path are disabled by default, for more information see:")
+
+	envVar := cli.GetDefaultEnv()
+	envVar["ARDUINO_ENABLE_UNSAFE_LIBRARY_INSTALL"] = "true"
+	// Verifies installation is successful when flags are enabled with env var
+	stdout, _, err := cli.RunWithCustomEnv(envVar, "lib", "install", "--git-url", gitUrl)
+	require.NoError(t, err)
+	require.Contains(t, string(stdout), "--git-url and --zip-path flags allow installing untrusted files, use it at your own risk.")
+
+	stdout, _, err = cli.RunWithCustomEnv(envVar, "lib", "install", "--zip-path", zipPath.String())
+	require.NoError(t, err)
+	require.Contains(t, string(stdout), "--git-url and --zip-path flags allow installing untrusted files, use it at your own risk.")
+
+	// Uninstall libraries to install them again
+	_, _, err = cli.Run("lib", "uninstall", "WiFi101", "AudioZero")
+	require.NoError(t, err)
+
+	// Verifies installation is successful when flags are enabled with settings file
+	_, _, err = cli.RunWithCustomEnv(envVar, "config", "init", "--dest-dir", ".")
+	require.NoError(t, err)
+
+	stdout, _, err = cli.Run("lib", "install", "--git-url", gitUrl)
+	require.NoError(t, err)
+	require.Contains(t, string(stdout), "--git-url and --zip-path flags allow installing untrusted files, use it at your own risk.")
+
+	stdout, _, err = cli.Run("lib", "install", "--zip-path", zipPath.String())
+	require.NoError(t, err)
+	require.Contains(t, string(stdout), "--git-url and --zip-path flags allow installing untrusted files, use it at your own risk.")
+}
+
+func TestInstallWithZipPath(t *testing.T) {
+	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
+	defer env.CleanUp()
+
+	// Initialize configs to enable --zip-path flag
+	envVar := cli.GetDefaultEnv()
+	envVar["ARDUINO_ENABLE_UNSAFE_LIBRARY_INSTALL"] = "true"
+	_, _, err := cli.RunWithCustomEnv(envVar, "config", "init", "--dest-dir", ".")
+	require.NoError(t, err)
+
+	// Download a specific lib version
+	// Download library
+	url := "https://github.com/arduino-libraries/AudioZero/archive/refs/tags/1.1.1.zip"
+	zipPath := cli.DownloadDir().Join("libraries", "AudioZero.zip")
+	require.NoError(t, zipPath.Parent().MkdirAll())
+	downloadLib(t, url, zipPath)
+
+	libInstallDir := cli.SketchbookDir().Join("libraries", "AudioZero")
+	// Verifies library is not already installed
+	require.NoDirExists(t, libInstallDir.String())
+
+	// Test zip-path install
+	stdout, _, err := cli.Run("lib", "install", "--zip-path", zipPath.String())
+	require.NoError(t, err)
+	require.Contains(t, string(stdout), "--git-url and --zip-path flags allow installing untrusted files, use it at your own risk.")
+
+	// Verifies library is installed in expected path
+	require.DirExists(t, libInstallDir.String())
+	files, err := libInstallDir.ReadDirRecursive()
+	require.NoError(t, err)
+	require.Contains(t, files, libInstallDir.Join("examples", "SimpleAudioPlayerZero", "SimpleAudioPlayerZero.ino"))
+	require.Contains(t, files, libInstallDir.Join("src", "AudioZero.h"))
+	require.Contains(t, files, libInstallDir.Join("src", "AudioZero.cpp"))
+	require.Contains(t, files, libInstallDir.Join("keywords.txt"))
+	require.Contains(t, files, libInstallDir.Join("library.properties"))
+	require.Contains(t, files, libInstallDir.Join("README.adoc"))
+
+	// Reinstall library
+	_, _, err = cli.Run("lib", "install", "--zip-path", zipPath.String())
+	require.NoError(t, err)
+
+	// Verifies library remains installed
+	require.DirExists(t, libInstallDir.String())
+	files, err = libInstallDir.ReadDirRecursive()
+	require.NoError(t, err)
+	require.Contains(t, files, libInstallDir.Join("examples", "SimpleAudioPlayerZero", "SimpleAudioPlayerZero.ino"))
+	require.Contains(t, files, libInstallDir.Join("src", "AudioZero.h"))
+	require.Contains(t, files, libInstallDir.Join("src", "AudioZero.cpp"))
+	require.Contains(t, files, libInstallDir.Join("keywords.txt"))
+	require.Contains(t, files, libInstallDir.Join("library.properties"))
+	require.Contains(t, files, libInstallDir.Join("README.adoc"))
+}
+
+func TestInstallWithZipPathMultipleLibraries(t *testing.T) {
+	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
+	defer env.CleanUp()
+
+	_, _, err := cli.Run("update")
+	require.NoError(t, err)
+
+	envVar := cli.GetDefaultEnv()
+	envVar["ARDUINO_ENABLE_UNSAFE_LIBRARY_INSTALL"] = "true"
+
+	// Downloads zips to be installed later
+	wifiZipPath := cli.DownloadDir().Join("libraries", "WiFi101-0.16.1.zip")
+	bleZipPath := cli.DownloadDir().Join("libraries", "ArduinoBLE-1.1.3.zip")
+	downloadLib(t, "https://github.com/arduino-libraries/WiFi101/archive/refs/tags/0.16.1.zip", wifiZipPath)
+	downloadLib(t, "https://github.com/arduino-libraries/ArduinoBLE/archive/refs/tags/1.1.3.zip", bleZipPath)
+
+	wifiInstallDir := cli.SketchbookDir().Join("libraries", "WiFi101")
+	bleInstallDir := cli.SketchbookDir().Join("libraries", "ArduinoBLE")
+	// Verifies libraries are not installed
+	require.NoDirExists(t, wifiInstallDir.String())
+	require.NoDirExists(t, bleInstallDir.String())
+
+	_, _, err = cli.RunWithCustomEnv(envVar, "lib", "install", "--zip-path", wifiZipPath.String(), bleZipPath.String())
+	require.NoError(t, err)
+
+	// Verifies libraries are installed
+	require.DirExists(t, wifiInstallDir.String())
+	require.DirExists(t, bleInstallDir.String())
+}
+
+func TestInstallWithGitUrlLocalFileUri(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		t.Skip("Using a file uri as git url doesn't work on Windows, " +
+			"this must be removed when this issue is fixed: https://github.com/go-git/go-git/issues/247")
+	}
+
+	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
+	defer env.CleanUp()
+
+	envVar := cli.GetDefaultEnv()
+	envVar["ARDUINO_ENABLE_UNSAFE_LIBRARY_INSTALL"] = "true"
+
+	libInstallDir := cli.SketchbookDir().Join("libraries", "WiFi101")
+	// Verifies library is not installed
+	require.NoDirExists(t, libInstallDir.String())
+
+	// Clone repository locally
+	gitUrl := "https://github.com/arduino-libraries/WiFi101.git"
+	repoDir := cli.SketchbookDir().Join("WiFi101")
+	_, err := git.PlainClone(repoDir.String(), false, &git.CloneOptions{
+		URL: gitUrl,
+	})
+	require.NoError(t, err)
+
+	_, _, err = cli.RunWithCustomEnv(envVar, "lib", "install", "--git-url", "file://"+repoDir.String())
+	require.NoError(t, err)
+
+	// Verifies library is installed
+	require.DirExists(t, libInstallDir.String())
+}
diff --git a/test/testdata/fake-lib.zip b/internal/integrationtest/testdata/fake-lib.zip
similarity index 100%
rename from test/testdata/fake-lib.zip
rename to internal/integrationtest/testdata/fake-lib.zip
diff --git a/test/testdata/lib-without-header.zip b/internal/integrationtest/testdata/lib-without-header.zip
similarity index 100%
rename from test/testdata/lib-without-header.zip
rename to internal/integrationtest/testdata/lib-without-header.zip
diff --git a/test/testdata/lib-without-properties.zip b/internal/integrationtest/testdata/lib-without-properties.zip
similarity index 100%
rename from test/testdata/lib-without-properties.zip
rename to internal/integrationtest/testdata/lib-without-properties.zip
diff --git a/test/testdata/platform_with_bundled_library/boards.txt b/internal/integrationtest/testdata/platform_with_bundled_library/boards.txt
similarity index 100%
rename from test/testdata/platform_with_bundled_library/boards.txt
rename to internal/integrationtest/testdata/platform_with_bundled_library/boards.txt
diff --git a/test/testdata/platform_with_bundled_library/libraries/USBHost/library.properties b/internal/integrationtest/testdata/platform_with_bundled_library/libraries/USBHost/library.properties
similarity index 100%
rename from test/testdata/platform_with_bundled_library/libraries/USBHost/library.properties
rename to internal/integrationtest/testdata/platform_with_bundled_library/libraries/USBHost/library.properties
diff --git a/test/testdata/platform_with_bundled_library/platform.txt b/internal/integrationtest/testdata/platform_with_bundled_library/platform.txt
similarity index 100%
rename from test/testdata/platform_with_bundled_library/platform.txt
rename to internal/integrationtest/testdata/platform_with_bundled_library/platform.txt
diff --git a/test/test_lib.py b/test/test_lib.py
deleted file mode 100644
index 8446ea1dbe5..00000000000
--- a/test/test_lib.py
+++ /dev/null
@@ -1,480 +0,0 @@
-# This file is part of arduino-cli.
-#
-# Copyright 2020 ARDUINO SA (http://www.arduino.cc/)
-#
-# This software is released under the GNU General Public License version 3,
-# which covers the main part of arduino-cli.
-# The terms of this license can be found at:
-# https://www.gnu.org/licenses/gpl-3.0.en.html
-#
-# You can be released from the requirements of the above licenses by purchasing
-# a commercial license. Buying such a license is mandatory if you want to modify or
-# otherwise use the software for commercial activities involving the Arduino
-# software without disclosing the source code of your own applications. To purchase
-# a commercial license, send an email to license@arduino.cc.
-import platform
-
-import simplejson as json
-import pytest
-import shutil
-from git import Repo
-from pathlib import Path
-import tempfile
-import requests
-import zipfile
-import io
-import re
-
-
-# Util function to download library from URL
-def download_lib(url, download_dir):
-    tmp = Path(tempfile.TemporaryDirectory().name)
-    tmp.mkdir(parents=True, exist_ok=True)
-    regex = re.compile(r"^(.*)-[0-9]+.[0-9]+.[0-9]")
-    response = requests.get(url)
-    # Download and unzips library removing version suffix
-    with zipfile.ZipFile(io.BytesIO(response.content)) as thezip:
-        for zipinfo in thezip.infolist():
-            with thezip.open(zipinfo) as f:
-                dest_dir = tmp / regex.sub("\\g<1>", zipinfo.filename)
-                if zipinfo.is_dir():
-                    dest_dir.mkdir(parents=True, exist_ok=True)
-                else:
-                    dest_dir.write_bytes(f.read())
-
-    # Recreates zip with folder without version suffix
-    z = zipfile.ZipFile(download_dir, "w")
-    for f in tmp.glob("**/*"):
-        z.write(f, arcname=f.relative_to(tmp))
-    z.close()
-
-
-def test_install_git_url_and_zip_path_flags_visibility(run_command, data_dir, downloads_dir):
-    # Verifies installation fail because flags are not found
-    git_url = "https://github.com/arduino-libraries/WiFi101.git"
-    res = run_command(["lib", "install", "--git-url", git_url])
-    assert res.failed
-    assert "--git-url and --zip-path are disabled by default, for more information see:" in res.stderr
-
-    # Download library
-    url = "https://github.com/arduino-libraries/AudioZero/archive/refs/tags/1.1.1.zip"
-    zip_path = Path(downloads_dir, "libraries", "AudioZero.zip")
-    zip_path.parent.mkdir(parents=True, exist_ok=True)
-    download_lib(url, zip_path)
-
-    res = run_command(["lib", "install", "--zip-path", zip_path])
-    assert res.failed
-    assert "--git-url and --zip-path are disabled by default, for more information see:" in res.stderr
-
-    env = {
-        "ARDUINO_DATA_DIR": data_dir,
-        "ARDUINO_DOWNLOADS_DIR": downloads_dir,
-        "ARDUINO_SKETCHBOOK_DIR": data_dir,
-        "ARDUINO_ENABLE_UNSAFE_LIBRARY_INSTALL": "true",
-    }
-    # Verifies installation is successful when flags are enabled with env var
-    res = run_command(["lib", "install", "--git-url", git_url], custom_env=env)
-    assert res.ok
-    assert "--git-url and --zip-path flags allow installing untrusted files, use it at your own risk." in res.stdout
-
-    res = run_command(["lib", "install", "--zip-path", zip_path], custom_env=env)
-    assert res.ok
-    assert "--git-url and --zip-path flags allow installing untrusted files, use it at your own risk." in res.stdout
-
-    # Uninstall libraries to install them again
-    assert run_command(["lib", "uninstall", "WiFi101", "AudioZero"])
-
-    # Verifies installation is successful when flags are enabled with settings file
-    assert run_command(["config", "init", "--dest-dir", "."], custom_env=env)
-
-    res = run_command(["lib", "install", "--git-url", git_url])
-    assert res.ok
-    assert "--git-url and --zip-path flags allow installing untrusted files, use it at your own risk." in res.stdout
-
-    res = run_command(["lib", "install", "--zip-path", zip_path])
-    assert res.ok
-    assert "--git-url and --zip-path flags allow installing untrusted files, use it at your own risk." in res.stdout
-
-
-def test_install_with_zip_path(run_command, data_dir, downloads_dir):
-    # Initialize configs to enable --zip-path flag
-    env = {
-        "ARDUINO_DATA_DIR": data_dir,
-        "ARDUINO_DOWNLOADS_DIR": downloads_dir,
-        "ARDUINO_SKETCHBOOK_DIR": data_dir,
-        "ARDUINO_ENABLE_UNSAFE_LIBRARY_INSTALL": "true",
-    }
-    assert run_command(["config", "init", "--dest-dir", "."], custom_env=env)
-
-    # Download a specific lib version
-    # Download library
-    url = "https://github.com/arduino-libraries/AudioZero/archive/refs/tags/1.1.1.zip"
-    zip_path = Path(downloads_dir, "libraries", "AudioZero.zip")
-    zip_path.parent.mkdir(parents=True, exist_ok=True)
-    download_lib(url, zip_path)
-
-    lib_install_dir = Path(data_dir, "libraries", "AudioZero")
-    # Verifies library is not already installed
-    assert not lib_install_dir.exists()
-
-    # Test zip-path install
-    res = run_command(["lib", "install", "--zip-path", zip_path])
-    assert res.ok
-    assert "--git-url and --zip-path flags allow installing untrusted files, use it at your own risk." in res.stdout
-
-    # Verifies library is installed in expected path
-    assert lib_install_dir.exists()
-    files = list(lib_install_dir.glob("**/*"))
-    assert lib_install_dir / "examples" / "SimpleAudioPlayerZero" / "SimpleAudioPlayerZero.ino" in files
-    assert lib_install_dir / "src" / "AudioZero.h" in files
-    assert lib_install_dir / "src" / "AudioZero.cpp" in files
-    assert lib_install_dir / "keywords.txt" in files
-    assert lib_install_dir / "library.properties" in files
-    assert lib_install_dir / "README.adoc" in files
-
-    # Reinstall library
-    assert run_command(["lib", "install", "--zip-path", zip_path])
-
-    # Verifies library remains installed
-    assert lib_install_dir.exists()
-    files = list(lib_install_dir.glob("**/*"))
-    assert lib_install_dir / "examples" / "SimpleAudioPlayerZero" / "SimpleAudioPlayerZero.ino" in files
-    assert lib_install_dir / "src" / "AudioZero.h" in files
-    assert lib_install_dir / "src" / "AudioZero.cpp" in files
-    assert lib_install_dir / "keywords.txt" in files
-    assert lib_install_dir / "library.properties" in files
-    assert lib_install_dir / "README.adoc" in files
-
-
-@pytest.mark.skipif(
-    platform.system() == "Windows",
-    reason="Using a file uri as git url doesn't work on Windows, "
-    + "this must be removed when this issue is fixed: https://github.com/go-git/go-git/issues/247",
-)
-def test_install_with_git_url_local_file_uri(run_command, downloads_dir, data_dir):
-    assert run_command(["update"])
-
-    env = {
-        "ARDUINO_DATA_DIR": data_dir,
-        "ARDUINO_DOWNLOADS_DIR": downloads_dir,
-        "ARDUINO_SKETCHBOOK_DIR": data_dir,
-        "ARDUINO_ENABLE_UNSAFE_LIBRARY_INSTALL": "true",
-    }
-
-    lib_install_dir = Path(data_dir, "libraries", "WiFi101")
-    # Verifies library is not installed
-    assert not lib_install_dir.exists()
-
-    # Clone repository locally
-    git_url = "https://github.com/arduino-libraries/WiFi101.git"
-    repo_dir = Path(data_dir, "WiFi101")
-    assert Repo.clone_from(git_url, repo_dir)
-
-    assert run_command(["lib", "install", "--git-url", repo_dir.as_uri()], custom_env=env)
-
-    # Verifies library is installed
-    assert lib_install_dir.exists()
-
-
-def test_install_with_zip_path_multiple_libraries(run_command, downloads_dir, data_dir):
-    assert run_command(["update"])
-
-    env = {
-        "ARDUINO_DATA_DIR": data_dir,
-        "ARDUINO_DOWNLOADS_DIR": downloads_dir,
-        "ARDUINO_SKETCHBOOK_DIR": data_dir,
-        "ARDUINO_ENABLE_UNSAFE_LIBRARY_INSTALL": "true",
-    }
-
-    # Downloads zip to be installed later
-    wifi_zip_path = Path(downloads_dir, "libraries", "WiFi101-0.16.1.zip")
-    ble_zip_path = Path(downloads_dir, "libraries", "ArduinoBLE-1.1.3.zip")
-    download_lib("https://github.com/arduino-libraries/WiFi101/archive/refs/tags/0.16.1.zip", wifi_zip_path)
-    download_lib("https://github.com/arduino-libraries/ArduinoBLE/archive/refs/tags/1.1.3.zip", ble_zip_path)
-
-    wifi_install_dir = Path(data_dir, "libraries", "WiFi101")
-    ble_install_dir = Path(data_dir, "libraries", "ArduinoBLE")
-
-    # Verifies libraries are not installed
-    assert not wifi_install_dir.exists()
-    assert not ble_install_dir.exists()
-
-    assert run_command(["lib", "install", "--zip-path", wifi_zip_path, ble_zip_path], custom_env=env)
-
-    # Verifies library are installed
-    assert wifi_install_dir.exists()
-    assert ble_install_dir.exists()
-
-
-def test_lib_examples_with_case_mismatch(run_command, data_dir):
-    assert run_command(["update"])
-
-    assert run_command(["lib", "install", "WiFiManager@2.0.3-alpha"])
-
-    res = run_command(["lib", "examples", "WiFiManager", "--format", "json"])
-    assert res.ok
-    data = json.loads(res.stdout)
-    assert len(data) == 1
-    examples = data[0]["examples"]
-
-    assert len(examples) == 14
-
-    examples_path = Path(data_dir, "libraries", "WiFiManager", "examples")
-    # Verifies sketches with correct casing are listed
-    assert str(examples_path / "Advanced") in examples
-    assert str(examples_path / "AutoConnect" / "AutoConnectWithFeedbackLED") in examples
-    assert str(examples_path / "AutoConnect" / "AutoConnectWithFSParameters") in examples
-    assert str(examples_path / "AutoConnect" / "AutoConnectWithFSParametersAndCustomIP") in examples
-    assert str(examples_path / "Basic") in examples
-    assert str(examples_path / "DEV" / "OnDemandConfigPortal") in examples
-    assert str(examples_path / "NonBlocking" / "AutoConnectNonBlocking") in examples
-    assert str(examples_path / "NonBlocking" / "AutoConnectNonBlockingwParams") in examples
-    assert str(examples_path / "Old_examples" / "AutoConnectWithFeedback") in examples
-    assert str(examples_path / "Old_examples" / "AutoConnectWithReset") in examples
-    assert str(examples_path / "Old_examples" / "AutoConnectWithStaticIP") in examples
-    assert str(examples_path / "Old_examples" / "AutoConnectWithTimeout") in examples
-    assert str(examples_path / "OnDemand" / "OnDemandConfigPortal") in examples
-    assert str(examples_path / "ParamsChildClass") in examples
-
-    # Verifies sketches with wrong casing are not returned
-    assert str(examples_path / "NonBlocking" / "OnDemandNonBlocking") not in examples
-    assert str(examples_path / "OnDemand" / "OnDemandWebPortal") not in examples
-
-
-def test_lib_list_using_library_with_invalid_version(run_command, data_dir):
-    assert run_command(["update"])
-
-    # Install a library
-    assert run_command(["lib", "install", "WiFi101@0.16.1"])
-
-    # Verifies library is correctly returned
-    res = run_command(["lib", "list", "--format", "json"])
-    assert res.ok
-    data = json.loads(res.stdout)
-    assert len(data) == 1
-    assert "0.16.1" == data[0]["library"]["version"]
-
-    # Changes the version of the currently installed library so that it's
-    # invalid
-    lib_path = Path(data_dir, "libraries", "WiFi101")
-    Path(lib_path, "library.properties").write_text("name=WiFi101\nversion=1.0001")
-
-    # Verifies version is now empty
-    res = run_command(["lib", "list", "--format", "json"])
-    assert res.ok
-    data = json.loads(res.stdout)
-    assert len(data) == 1
-    assert "version" not in data[0]["library"]
-
-
-def test_lib_upgrade_using_library_with_invalid_version(run_command, data_dir):
-    assert run_command(["update"])
-
-    # Install a library
-    assert run_command(["lib", "install", "WiFi101@0.16.1"])
-
-    # Verifies library is correctly returned
-    res = run_command(["lib", "list", "--format", "json"])
-    assert res.ok
-    data = json.loads(res.stdout)
-    assert len(data) == 1
-    assert "0.16.1" == data[0]["library"]["version"]
-
-    # Changes the version of the currently installed library so that it's
-    # invalid
-    lib_path = Path(data_dir, "libraries", "WiFi101")
-    Path(lib_path, "library.properties").write_text("name=WiFi101\nversion=1.0001")
-
-    # Verifies version is now empty
-    res = run_command(["lib", "list", "--format", "json"])
-    assert res.ok
-    data = json.loads(res.stdout)
-    assert len(data) == 1
-    assert "version" not in data[0]["library"]
-
-    # Upgrade library
-    assert run_command(["lib", "upgrade", "WiFi101"])
-
-    # Verifies library has been updated
-    res = run_command(["lib", "list", "--format", "json"])
-    assert res.ok
-    data = json.loads(res.stdout)
-    assert len(data) == 1
-    assert "" != data[0]["library"]["version"]
-
-
-def test_install_zip_lib_with_macos_metadata(run_command, data_dir, downloads_dir):
-    # Initialize configs to enable --zip-path flag
-    env = {
-        "ARDUINO_DATA_DIR": data_dir,
-        "ARDUINO_DOWNLOADS_DIR": downloads_dir,
-        "ARDUINO_SKETCHBOOK_DIR": data_dir,
-        "ARDUINO_ENABLE_UNSAFE_LIBRARY_INSTALL": "true",
-    }
-    assert run_command(["config", "init", "--dest-dir", "."], custom_env=env)
-
-    lib_install_dir = Path(data_dir, "libraries", "fake-lib")
-    # Verifies library is not already installed
-    assert not lib_install_dir.exists()
-
-    zip_path = Path(__file__).parent / "testdata" / "fake-lib.zip"
-    # Test zip-path install
-    res = run_command(["lib", "install", "--zip-path", zip_path])
-    assert res.ok
-    assert "--git-url and --zip-path flags allow installing untrusted files, use it at your own risk." in res.stdout
-
-    # Verifies library is installed in expected path
-    assert lib_install_dir.exists()
-    files = list(lib_install_dir.glob("**/*"))
-    assert lib_install_dir / "library.properties" in files
-    assert lib_install_dir / "src" / "fake-lib.h" in files
-
-    # Reinstall library
-    assert run_command(["lib", "install", "--zip-path", zip_path])
-
-    # Verifies library remains installed
-    assert lib_install_dir.exists()
-    files = list(lib_install_dir.glob("**/*"))
-    assert lib_install_dir / "library.properties" in files
-    assert lib_install_dir / "src" / "fake-lib.h" in files
-
-
-def test_install_zip_invalid_library(run_command, data_dir, downloads_dir):
-    # Initialize configs to enable --zip-path flag
-    env = {
-        "ARDUINO_DATA_DIR": data_dir,
-        "ARDUINO_DOWNLOADS_DIR": downloads_dir,
-        "ARDUINO_SKETCHBOOK_DIR": data_dir,
-        "ARDUINO_ENABLE_UNSAFE_LIBRARY_INSTALL": "true",
-    }
-    assert run_command(["config", "init", "--dest-dir", "."], custom_env=env)
-
-    lib_install_dir = Path(data_dir, "libraries", "lib-without-header")
-    # Verifies library is not already installed
-    assert not lib_install_dir.exists()
-
-    zip_path = Path(__file__).parent / "testdata" / "lib-without-header.zip"
-    # Test zip-path install
-    res = run_command(["lib", "install", "--zip-path", zip_path])
-    assert res.failed
-    assert "library not valid" in res.stderr
-
-    lib_install_dir = Path(data_dir, "libraries", "lib-without-properties")
-    # Verifies library is not already installed
-    assert not lib_install_dir.exists()
-
-    zip_path = Path(__file__).parent / "testdata" / "lib-without-properties.zip"
-    # Test zip-path install
-    res = run_command(["lib", "install", "--zip-path", zip_path])
-    assert res.failed
-    assert "library not valid" in res.stderr
-
-
-def test_install_git_invalid_library(run_command, data_dir, downloads_dir):
-    # Initialize configs to enable --zip-path flag
-    env = {
-        "ARDUINO_DATA_DIR": data_dir,
-        "ARDUINO_DOWNLOADS_DIR": downloads_dir,
-        "ARDUINO_SKETCHBOOK_DIR": data_dir,
-        "ARDUINO_ENABLE_UNSAFE_LIBRARY_INSTALL": "true",
-    }
-    assert run_command(["config", "init", "--dest-dir", "."], custom_env=env)
-
-    # Create fake library repository
-    repo_dir = Path(data_dir, "lib-without-header")
-    with Repo.init(repo_dir) as repo:
-        lib_properties = Path(repo_dir, "library.properties")
-        lib_properties.touch()
-        repo.index.add([str(lib_properties)])
-        repo.index.commit("First commit")
-
-    lib_install_dir = Path(data_dir, "libraries", "lib-without-header")
-    # Verifies library is not already installed
-    assert not lib_install_dir.exists()
-
-    res = run_command(["lib", "install", "--git-url", repo_dir], custom_env=env)
-    assert res.failed
-    assert "library not valid" in res.stderr
-    assert not lib_install_dir.exists()
-
-    # Create another fake library repository
-    repo_dir = Path(data_dir, "lib-without-properties")
-    with Repo.init(repo_dir) as repo:
-        lib_header = Path(repo_dir, "src", "lib-without-properties.h")
-        lib_header.parent.mkdir(parents=True, exist_ok=True)
-        lib_header.touch()
-        repo.index.add([str(lib_header)])
-        repo.index.commit("First commit")
-
-    lib_install_dir = Path(data_dir, "libraries", "lib-without-properties")
-    # Verifies library is not already installed
-    assert not lib_install_dir.exists()
-
-    res = run_command(["lib", "install", "--git-url", repo_dir], custom_env=env)
-    assert res.failed
-    assert "library not valid" in res.stderr
-    assert not lib_install_dir.exists()
-
-
-def test_upgrade_does_not_try_to_upgrade_bundled_core_libraries_in_sketchbook(run_command, data_dir):
-    test_platform_name = "platform_with_bundled_library"
-    platform_install_dir = Path(data_dir, "hardware", "arduino-beta-dev", test_platform_name)
-    platform_install_dir.mkdir(parents=True)
-
-    # Install platform in Sketchbook hardware dir
-    shutil.copytree(
-        Path(__file__).parent / "testdata" / test_platform_name,
-        platform_install_dir,
-        dirs_exist_ok=True,
-    )
-
-    assert run_command(["update"])
-
-    # Install latest version of library identical to one
-    # bundled with test platform
-    assert run_command(["lib", "install", "USBHost"])
-
-    res = run_command(["lib", "list", "--all", "--format", "json"])
-    assert res.ok
-    libs = json.loads(res.stdout)
-    assert len(libs) == 2
-    # Verify both libraries have the same name
-    assert libs[0]["library"]["name"] == "USBHost"
-    assert libs[1]["library"]["name"] == "USBHost"
-
-    res = run_command(["lib", "upgrade"])
-    assert res.ok
-    # Empty output means nothing has been updated as expected
-    assert res.stdout == ""
-
-
-def test_upgrade_does_not_try_to_upgrade_bundled_core_libraries(run_command, data_dir):
-    test_platform_name = "platform_with_bundled_library"
-    platform_install_dir = Path(data_dir, "packages", "arduino", "hardware", "arch", "4.2.0")
-    platform_install_dir.mkdir(parents=True)
-
-    # Simulate installation of a platform with arduino-cli
-    shutil.copytree(
-        Path(__file__).parent / "testdata" / test_platform_name,
-        platform_install_dir,
-        dirs_exist_ok=True,
-    )
-
-    assert run_command(["update"])
-
-    # Install latest version of library identical to one
-    # bundled with test platform
-    assert run_command(["lib", "install", "USBHost"])
-
-    res = run_command(["lib", "list", "--all", "--format", "json"])
-    assert res.ok
-    libs = json.loads(res.stdout)
-    assert len(libs) == 2
-    # Verify both libraries have the same name
-    assert libs[0]["library"]["name"] == "USBHost"
-    assert libs[1]["library"]["name"] == "USBHost"
-
-    res = run_command(["lib", "upgrade"])
-    assert res.ok
-    # Empty output means nothing has been updated as expected
-    assert res.stdout == ""