diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
index 5a2820c3..9b4bec9b 100644
--- a/pkg/config/config_test.go
+++ b/pkg/config/config_test.go
@@ -305,23 +305,21 @@ func Test_checkFilePerms(t *testing.T) {
 
 	f1, err := ioutil.TempFile(os.TempDir(), "prefix-")
 	if err != nil {
-		t.FailNow()
+		t.Fatalf("Cannot create 1st temp file: %s", err)
 	}
 	defer os.Remove(f1.Name())
-	err = os.Chmod(f1.Name(), 0700)
-	if err != nil {
-		t.Fatalf("%s\n", err)
+	if err = os.Chmod(f1.Name(), 0700); err != nil {
+		t.Fatalf("Cannot chmod 1st temp file: %s", err)
 	}
 
 	f2, err := ioutil.TempFile(os.TempDir(), "prefix-")
 	if err != nil {
-		t.FailNow()
+		t.Fatalf("Cannot create 2nd temp file: %s", err)
 	}
 
 	defer os.Remove(f2.Name())
-	err = os.Chmod(f2.Name(), 0640)
-	if err != nil {
-		t.Fatalf("%s\n", err)
+	if err = os.Chmod(f2.Name(), 0640); err != nil {
+		t.Fatalf("Cannot chmod 2nd temp file: %s", err)
 	}
 
 	type args struct {
diff --git a/pkg/middleware/middleware_test.go b/pkg/middleware/middleware_test.go
index b3450d85..b058802c 100644
--- a/pkg/middleware/middleware_test.go
+++ b/pkg/middleware/middleware_test.go
@@ -74,7 +74,7 @@ func Test_FilterMiddleware(t *testing.T) {
 	r.Error(err, "Expected error when a file not existing on the filesystem is given")
 
 	app, err = middlewareFilterApp(filter.Name(), conf.GlobalEndpoint)
-	r.NoError(err, "app should be succesfully created in the test")
+	r.NoError(err, "app should be successfully created in the test")
 	w := ht.New(app)
 
 	// Public, expects to be redirected to the global registry endpoint, with and without a trailing slash
diff --git a/pkg/storage/gcp/gcp_test.go b/pkg/storage/gcp/gcp_test.go
index b2154e56..c9baaa7c 100644
--- a/pkg/storage/gcp/gcp_test.go
+++ b/pkg/storage/gcp/gcp_test.go
@@ -29,6 +29,8 @@ func (g *GcpTests) TestSaveGetListExistsRoundTrip() {
 		r.Equal(info, infoBts)
 
 		ziprc, err := g.store.Zip(ctx, g.module, g.version)
+		r.NoError(err)
+
 		gotZip, err := ioutil.ReadAll(ziprc)
 		r.NoError(ziprc.Close())
 		r.NoError(err)
diff --git a/pkg/storage/gcp/saver.go b/pkg/storage/gcp/saver.go
index f53f3888..55eeef97 100644
--- a/pkg/storage/gcp/saver.go
+++ b/pkg/storage/gcp/saver.go
@@ -17,7 +17,7 @@ import (
 // from the standard library until context has been threaded down the stack.
 // see issue: https://github.com/gomods/athens/issues/174
 //
-// Uploaded files are publicly accessable in the storage bucket as per
+// Uploaded files are publicly accessible in the storage bucket as per
 // an ACL rule.
 func (s *Storage) Save(ctx context.Context, module, version string, mod []byte, zip io.Reader, info []byte) error {
 	const op errors.Op = "gcp.Save"