diff --git a/Makefile b/Makefile
index 7c30364..c69628a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 OUT_DIR := ./out
 GO_FILES := $(shell find . -type f \( -iname '*.go' \))
+GO_MODULE := github.com/pushbits/cli
 
 .PHONY: build
 build:
@@ -12,17 +13,18 @@ clean:
 
 .PHONY: test
 test:
-	stdout=$$(gofumpt -l . 2>&1); if [ "$$stdout" ]; then exit 1; fi
+	if [ -n "$$(gofumpt -l $(GO_FILES))" ]; then echo "Code is not properly formatted"; exit 1; fi
+	if [ -n "$$(goimports -l -local $(GO_MODULE) $(GO_FILES))" ]; then echo "Imports are not properly formatted"; exit 1; fi
 	go vet ./...
 	misspell -error $(GO_FILES)
 	gocyclo -over 10 $(GO_FILES)
 	staticcheck ./...
-	errcheck ./...
+	errcheck -ignoregenerated ./...
 	gocritic check -disable='#experimental,#opinionated' -@ifElseChain.minThreshold 3 ./...
 	revive -set_exit_status ./...
 	nilaway ./...
 	go test -v -cover ./...
-	gosec -exclude-dir=tests ./...
+	gosec -exclude-generated ./...
 	govulncheck ./...
 	@printf '\n%s\n' "> Test successful"
 
@@ -35,6 +37,7 @@ setup:
 	go install github.com/mgechev/revive@latest
 	go install github.com/securego/gosec/v2/cmd/gosec@latest
 	go install go.uber.org/nilaway/cmd/nilaway@latest
+	go install golang.org/x/tools/cmd/goimports@latest
 	go install golang.org/x/vuln/cmd/govulncheck@latest
 	go install honnef.co/go/tools/cmd/staticcheck@latest
 	go install mvdan.cc/gofumpt@latest
diff --git a/internal/api/mod.go b/internal/api/mod.go
index 40ca45f..97735c3 100644
--- a/internal/api/mod.go
+++ b/internal/api/mod.go
@@ -9,8 +9,9 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/pushbits/cli/internal/handling"
 	log "github.com/sirupsen/logrus"
+
+	"github.com/pushbits/cli/internal/handling"
 )
 
 func buildURL(baseStr string, endpoint string) *url.URL {