diff --git a/http/middleware/iam/iam.go b/http/middleware/iam/iam.go
index f925e255..b2f785fa 100644
--- a/http/middleware/iam/iam.go
+++ b/http/middleware/iam/iam.go
@@ -88,11 +88,7 @@ func NewWithConfig(config Config) echo.MiddlewareFunc {
 
 	// Sort the mounts from longest to shortest
 	sort.Slice(mw.mounts, func(i, j int) bool {
-		if len(mw.mounts[i]) > len(mw.mounts[j]) {
-			return true
-		}
-
-		return false
+		return len(mw.mounts[i]) > len(mw.mounts[j])
 	})
 
 	mw.logger.Debug().WithField("mounts", mw.mounts).Log("")
diff --git a/http/mock/mock.go b/http/mock/mock.go
index 926340e3..fddd31fc 100644
--- a/http/mock/mock.go
+++ b/http/mock/mock.go
@@ -62,6 +62,9 @@ func DummyRestreamer(pathPrefix string) (restream.Restreamer, error) {
 		JWTSecret: "",
 		Logger:    nil,
 	})
+	if err != nil {
+		return nil, err
+	}
 
 	iam.AddPolicy("$anon", "$none", "api:/**", "ANY")
 	iam.AddPolicy("$anon", "$none", "fs:/**", "ANY")
diff --git a/restream/restream_test.go b/restream/restream_test.go
index 71a174e8..fa2e9158 100644
--- a/restream/restream_test.go
+++ b/restream/restream_test.go
@@ -47,6 +47,9 @@ func getDummyRestreamer(portrange net.Portranger, validatorIn, validatorOut ffmp
 		JWTSecret: "",
 		Logger:    nil,
 	})
+	if err != nil {
+		return nil, err
+	}
 
 	iam.AddPolicy("$anon", "$none", "process:*", "CREATE|GET|DELETE|UPDATE|COMMAND|PROBE|METADATA|PLAYOUT")
 
@@ -443,7 +446,7 @@ func TestProcessMetadata(t *testing.T) {
 	rs.AddProcess(process)
 
 	data, err := rs.GetProcessMetadata(process.ID, "", "", "foobar")
-	require.Error(t, ErrMetadataKeyNotFound)
+	require.Equal(t, ErrMetadataKeyNotFound, err)
 	require.Equal(t, nil, data, "nothing should be stored under the key")
 
 	err = rs.SetProcessMetadata(process.ID, "", "", "foobar", process)