diff --git a/config/bootstrap_peers.go b/config/bootstrap_peers.go
index 91f8ea1af..55fe66a98 100644
--- a/config/bootstrap_peers.go
+++ b/config/bootstrap_peers.go
@@ -47,7 +47,7 @@ func (c *Config) SetBootstrapPeers(bps []peer.AddrInfo) {
 	c.Bootstrap = BootstrapPeerStrings(bps)
 }
 
-// ParseBootstrapPeer parses a bootstrap list into a list of AddrInfos.
+// ParseBootstrapPeers parses a bootstrap list into a list of AddrInfos.
 func ParseBootstrapPeers(addrs []string) ([]peer.AddrInfo, error) {
 	maddrs := make([]ma.Multiaddr, len(addrs))
 	for i, addr := range addrs {
diff --git a/core/commands/cid.go b/core/commands/cid.go
index a3f3a5490..26596f011 100644
--- a/core/commands/cid.go
+++ b/core/commands/cid.go
@@ -34,7 +34,7 @@ var CidCmd = &cmds.Command{
 
 const (
 	cidFormatOptionName    = "f"
-	cidVerisonOptionName   = "v"
+	cidToVersionOptionName = "v"
 	cidCodecOptionName     = "mc"
 	cidMultibaseOptionName = "b"
 )
@@ -53,13 +53,13 @@ The optional format string is a printf style format string:
 	},
 	Options: []cmds.Option{
 		cmds.StringOption(cidFormatOptionName, "Printf style format string.").WithDefault("%s"),
-		cmds.StringOption(cidVerisonOptionName, "CID version to convert to."),
+		cmds.StringOption(cidToVersionOptionName, "CID version to convert to."),
 		cmds.StringOption(cidCodecOptionName, "CID multicodec to convert to."),
 		cmds.StringOption(cidMultibaseOptionName, "Multibase to display CID in."),
 	},
 	Run: func(req *cmds.Request, resp cmds.ResponseEmitter, env cmds.Environment) error {
 		fmtStr, _ := req.Options[cidFormatOptionName].(string)
-		verStr, _ := req.Options[cidVerisonOptionName].(string)
+		verStr, _ := req.Options[cidToVersionOptionName].(string)
 		codecStr, _ := req.Options[cidCodecOptionName].(string)
 		baseStr, _ := req.Options[cidMultibaseOptionName].(string)
 
diff --git a/core/commands/cid_test.go b/core/commands/cid_test.go
index 106296282..d159521d2 100644
--- a/core/commands/cid_test.go
+++ b/core/commands/cid_test.go
@@ -40,7 +40,7 @@ func TestCidFmtCmd(t *testing.T) {
 			// Mock request
 			req := &cmds.Request{
 				Options: map[string]interface{}{
-					cidVerisonOptionName:   "0",
+					cidToVersionOptionName: "0",
 					cidMultibaseOptionName: e.MultibaseName,
 					cidFormatOptionName:    "%s",
 				},
@@ -91,7 +91,7 @@ func TestCidFmtCmd(t *testing.T) {
 			// Mock request
 			req := &cmds.Request{
 				Options: map[string]interface{}{
-					cidVerisonOptionName:   e.Ver,
+					cidToVersionOptionName: e.Ver,
 					cidMultibaseOptionName: e.MultibaseName,
 					cidFormatOptionName:    "%s",
 				},
diff --git a/repo/fsrepo/migrations/setup_test.go b/repo/fsrepo/migrations/setup_test.go
index 2e306fda1..9761edb94 100644
--- a/repo/fsrepo/migrations/setup_test.go
+++ b/repo/fsrepo/migrations/setup_test.go
@@ -32,9 +32,10 @@ var (
 )
 
 func TestMain(m *testing.M) {
+	t := &testing.T{}
+
 	// Setup test data
-	testDataDir := makeTestData()
-	defer os.RemoveAll(testDataDir)
+	testDataDir := makeTestData(t)
 
 	testCar := makeTestCar(testDataDir)
 	defer os.RemoveAll(testCar)
@@ -47,18 +48,15 @@ func TestMain(m *testing.M) {
 	os.Exit(m.Run())
 }
 
-func makeTestData() string {
-	tempDir, err := os.MkdirTemp("", "kubo-migrations-test-*")
-	if err != nil {
-		panic(err)
-	}
+func makeTestData(t testing.TB) string {
+	tempDir := t.TempDir()
 
 	versions := []string{"v1.0.0", "v1.1.0", "v1.1.2", "v2.0.0-rc1", "2.0.0", "v2.0.1"}
 	packages := []string{"kubo", "go-ipfs", "fs-repo-migrations", "fs-repo-1-to-2", "fs-repo-2-to-3", "fs-repo-9-to-10", "fs-repo-10-to-11"}
 
 	// Generate fake data
 	for _, name := range packages {
-		err = os.MkdirAll(filepath.Join(tempDir, name), 0777)
+		err := os.MkdirAll(filepath.Join(tempDir, name), 0777)
 		if err != nil {
 			panic(err)
 		}
diff --git a/test/cli/files_test.go b/test/cli/files_test.go
index 109c7ab9b..275261897 100644
--- a/test/cli/files_test.go
+++ b/test/cli/files_test.go
@@ -65,7 +65,7 @@ func TestFilesCp(t *testing.T) {
 		// we manually changed codec from raw to dag-pb to test "bad dag-pb" scenario
 		cid := "bafybeic7pdbte5heh6u54vszezob3el6exadoiw4wc4ne7ny2x7kvajzkm"
 
-		// should fail because node cant be read as a valid dag-pb
+		// should fail because node cannot be read as a valid dag-pb
 		cpResNoForce := node.RunIPFS("files", "cp", fmt.Sprintf("/ipfs/%s", cid), "/invalid-proto")
 		assert.NotEqual(t, 0, cpResNoForce.ExitErr.ExitCode())
 		assert.Contains(t, cpResNoForce.Stderr.String(), "Error")