Add some fixes for go test ./...