diff --git a/providers/amazon/amazon.go b/providers/amazon/amazon.go
index f584ded8c..7061e4d7a 100644
--- a/providers/amazon/amazon.go
+++ b/providers/amazon/amazon.go
@@ -5,12 +5,12 @@ package amazon
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 
-	"fmt"
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/amazon/amazon_test.go b/providers/amazon/amazon_test.go
index 59a0fc1b9..6360836bd 100644
--- a/providers/amazon/amazon_test.go
+++ b/providers/amazon/amazon_test.go
@@ -1,11 +1,12 @@
 package amazon_test
 
 import (
+	"os"
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/amazon"
 	"github.com/stretchr/testify/assert"
-	"os"
-	"testing"
 )
 
 func Test_New(t *testing.T) {
diff --git a/providers/amazon/session_test.go b/providers/amazon/session_test.go
index 101fb2654..32cadeb14 100644
--- a/providers/amazon/session_test.go
+++ b/providers/amazon/session_test.go
@@ -1,10 +1,11 @@
 package amazon_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/amazon"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/auth0/auth0.go b/providers/auth0/auth0.go
index 94dd0450e..c07b9db47 100644
--- a/providers/auth0/auth0.go
+++ b/providers/auth0/auth0.go
@@ -5,11 +5,10 @@ package auth0
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io"
 	"net/http"
 
-	"fmt"
-
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/auth0/session_test.go b/providers/auth0/session_test.go
index 043224411..2ddaaa684 100644
--- a/providers/auth0/session_test.go
+++ b/providers/auth0/session_test.go
@@ -1,10 +1,11 @@
 package auth0_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/auth0"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/battlenet/battlenet.go b/providers/battlenet/battlenet.go
index 6267aa7ba..3a52b47e7 100644
--- a/providers/battlenet/battlenet.go
+++ b/providers/battlenet/battlenet.go
@@ -5,11 +5,10 @@ package battlenet
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 
-	"fmt"
-
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/battlenet/battlenet_test.go b/providers/battlenet/battlenet_test.go
index e04610aa9..618a9e8dc 100644
--- a/providers/battlenet/battlenet_test.go
+++ b/providers/battlenet/battlenet_test.go
@@ -1,11 +1,12 @@
 package battlenet_test
 
 import (
+	"os"
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/battlenet"
 	"github.com/stretchr/testify/assert"
-	"os"
-	"testing"
 )
 
 func Test_New(t *testing.T) {
diff --git a/providers/battlenet/session_test.go b/providers/battlenet/session_test.go
index c753b6e2a..fd39dfcaf 100644
--- a/providers/battlenet/session_test.go
+++ b/providers/battlenet/session_test.go
@@ -1,10 +1,11 @@
 package battlenet_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/battlenet"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/box/box.go b/providers/box/box.go
index 4b744fc5c..92b8b730b 100644
--- a/providers/box/box.go
+++ b/providers/box/box.go
@@ -4,10 +4,10 @@ package box
 
 import (
 	"encoding/json"
+	"fmt"
 	"io"
 	"net/http"
 
-	"fmt"
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/box/box_test.go b/providers/box/box_test.go
index 8111da0e5..19bc14ca4 100644
--- a/providers/box/box_test.go
+++ b/providers/box/box_test.go
@@ -1,11 +1,12 @@
 package box_test
 
 import (
+	"os"
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/box"
 	"github.com/stretchr/testify/assert"
-	"os"
-	"testing"
 )
 
 func Test_New(t *testing.T) {
diff --git a/providers/box/session_test.go b/providers/box/session_test.go
index bf562d400..0f681d5c9 100644
--- a/providers/box/session_test.go
+++ b/providers/box/session_test.go
@@ -1,10 +1,11 @@
 package box_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/box"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/cloudfoundry/cf_test.go b/providers/cloudfoundry/cf_test.go
index 44a7d5e9b..b20384842 100644
--- a/providers/cloudfoundry/cf_test.go
+++ b/providers/cloudfoundry/cf_test.go
@@ -1,11 +1,12 @@
 package cloudfoundry_test
 
 import (
+	"os"
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/cloudfoundry"
 	"github.com/stretchr/testify/assert"
-	"os"
-	"testing"
 )
 
 func Test_New(t *testing.T) {
diff --git a/providers/cloudfoundry/session_test.go b/providers/cloudfoundry/session_test.go
index 58b02c309..19b5c1381 100644
--- a/providers/cloudfoundry/session_test.go
+++ b/providers/cloudfoundry/session_test.go
@@ -1,10 +1,11 @@
 package cloudfoundry_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/cloudfoundry"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/dailymotion/dailymotion.go b/providers/dailymotion/dailymotion.go
index 492cfa8a6..d3c1e1d24 100644
--- a/providers/dailymotion/dailymotion.go
+++ b/providers/dailymotion/dailymotion.go
@@ -5,12 +5,12 @@ package dailymotion
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 
-	"fmt"
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/dailymotion/session.go b/providers/dailymotion/session.go
index 9832b0439..5bf27e821 100644
--- a/providers/dailymotion/session.go
+++ b/providers/dailymotion/session.go
@@ -3,10 +3,11 @@ package dailymotion
 import (
 	"encoding/json"
 	"errors"
-	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"strings"
 	"time"
+
+	"github.com/markbates/goth"
+	"golang.org/x/oauth2"
 )
 
 // Session stores data during the auth process with Dailymotion.
diff --git a/providers/dailymotion/session_test.go b/providers/dailymotion/session_test.go
index 622224402..ad6c35035 100644
--- a/providers/dailymotion/session_test.go
+++ b/providers/dailymotion/session_test.go
@@ -1,10 +1,11 @@
 package dailymotion_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/dailymotion"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/deezer/deezer.go b/providers/deezer/deezer.go
index 538ed2415..e2e2e157c 100644
--- a/providers/deezer/deezer.go
+++ b/providers/deezer/deezer.go
@@ -6,12 +6,12 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 
-	"fmt"
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/deezer/session.go b/providers/deezer/session.go
index 3e5f49c57..968cf9c68 100644
--- a/providers/deezer/session.go
+++ b/providers/deezer/session.go
@@ -3,10 +3,11 @@ package deezer
 import (
 	"encoding/json"
 	"errors"
-	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"strings"
 	"time"
+
+	"github.com/markbates/goth"
+	"golang.org/x/oauth2"
 )
 
 // Session stores data during the auth process with Deezer.
diff --git a/providers/deezer/session_test.go b/providers/deezer/session_test.go
index 6834cd284..0ea219877 100644
--- a/providers/deezer/session_test.go
+++ b/providers/deezer/session_test.go
@@ -1,10 +1,11 @@
 package deezer_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/deezer"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/digitalocean/digitalocean.go b/providers/digitalocean/digitalocean.go
index 38c8e23ae..8c7c8c3b6 100644
--- a/providers/digitalocean/digitalocean.go
+++ b/providers/digitalocean/digitalocean.go
@@ -5,11 +5,11 @@ package digitalocean
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
 
-	"fmt"
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/discord/session.go b/providers/discord/session.go
index b3078f09a..a41cc5a0b 100644
--- a/providers/discord/session.go
+++ b/providers/discord/session.go
@@ -3,10 +3,11 @@ package discord
 import (
 	"encoding/json"
 	"errors"
-	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"strings"
 	"time"
+
+	"github.com/markbates/goth"
+	"golang.org/x/oauth2"
 )
 
 // Session stores data during the auth process with Discord
diff --git a/providers/dropbox/dropbox.go b/providers/dropbox/dropbox.go
index 235d400bd..a203fdd1b 100644
--- a/providers/dropbox/dropbox.go
+++ b/providers/dropbox/dropbox.go
@@ -5,13 +5,12 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"strings"
 
-	"fmt"
-
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/eveonline/eveonline.go b/providers/eveonline/eveonline.go
index d3125e9bc..ad18776b6 100644
--- a/providers/eveonline/eveonline.go
+++ b/providers/eveonline/eveonline.go
@@ -5,11 +5,10 @@ package eveonline
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 
-	"fmt"
-
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/fitbit/fitbit.go b/providers/fitbit/fitbit.go
index 5fe30c4f5..d196273e3 100644
--- a/providers/fitbit/fitbit.go
+++ b/providers/fitbit/fitbit.go
@@ -4,10 +4,10 @@ package fitbit
 
 import (
 	"encoding/json"
+	"fmt"
 	"io"
 	"net/http"
 
-	"fmt"
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/gitea/gitea.go b/providers/gitea/gitea.go
index ace83843f..6156df176 100644
--- a/providers/gitea/gitea.go
+++ b/providers/gitea/gitea.go
@@ -5,13 +5,13 @@ package gitea
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strconv"
 
-	"fmt"
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/gitea/session_test.go b/providers/gitea/session_test.go
index 4677b43fc..565b76653 100644
--- a/providers/gitea/session_test.go
+++ b/providers/gitea/session_test.go
@@ -1,10 +1,11 @@
 package gitea_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/gitea"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/gitlab/gitlab.go b/providers/gitlab/gitlab.go
index af4beab89..e5457cf0a 100644
--- a/providers/gitlab/gitlab.go
+++ b/providers/gitlab/gitlab.go
@@ -5,13 +5,13 @@ package gitlab
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strconv"
 
-	"fmt"
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/gitlab/session_test.go b/providers/gitlab/session_test.go
index 9939d1475..23682d2e2 100644
--- a/providers/gitlab/session_test.go
+++ b/providers/gitlab/session_test.go
@@ -1,10 +1,11 @@
 package gitlab_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/gitlab"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/gplus/gplus.go b/providers/gplus/gplus.go
index 2d0a0bba9..be31ab299 100644
--- a/providers/gplus/gplus.go
+++ b/providers/gplus/gplus.go
@@ -5,13 +5,13 @@ package gplus
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strings"
 
-	"fmt"
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/heroku/heroku.go b/providers/heroku/heroku.go
index 816151ddc..3df805463 100644
--- a/providers/heroku/heroku.go
+++ b/providers/heroku/heroku.go
@@ -4,11 +4,10 @@ package heroku
 
 import (
 	"encoding/json"
+	"fmt"
 	"io"
 	"net/http"
 
-	"fmt"
-
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/heroku/heroku_test.go b/providers/heroku/heroku_test.go
index 336f2e9b8..e50b846fd 100644
--- a/providers/heroku/heroku_test.go
+++ b/providers/heroku/heroku_test.go
@@ -1,11 +1,12 @@
 package heroku_test
 
 import (
+	"os"
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/heroku"
 	"github.com/stretchr/testify/assert"
-	"os"
-	"testing"
 )
 
 func Test_New(t *testing.T) {
diff --git a/providers/heroku/session_test.go b/providers/heroku/session_test.go
index 1a66e26be..abaf50e97 100644
--- a/providers/heroku/session_test.go
+++ b/providers/heroku/session_test.go
@@ -1,10 +1,11 @@
 package heroku_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/heroku"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/intercom/intercom_test.go b/providers/intercom/intercom_test.go
index df4a063c5..2fa3e98e7 100644
--- a/providers/intercom/intercom_test.go
+++ b/providers/intercom/intercom_test.go
@@ -3,14 +3,15 @@ package intercom_test
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/gorilla/pat"
-	"github.com/markbates/goth"
-	"github.com/markbates/goth/providers/intercom"
-	"github.com/stretchr/testify/assert"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"testing"
+
+	"github.com/gorilla/pat"
+	"github.com/markbates/goth"
+	"github.com/markbates/goth/providers/intercom"
+	"github.com/stretchr/testify/assert"
 )
 
 type fetchUserPayload struct {
diff --git a/providers/intercom/session.go b/providers/intercom/session.go
index ef188d4a6..c7a954663 100644
--- a/providers/intercom/session.go
+++ b/providers/intercom/session.go
@@ -3,10 +3,11 @@ package intercom
 import (
 	"encoding/json"
 	"errors"
-	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"strings"
 	"time"
+
+	"github.com/markbates/goth"
+	"golang.org/x/oauth2"
 )
 
 // Session stores data during the auth process with intercom.
diff --git a/providers/intercom/session_test.go b/providers/intercom/session_test.go
index 0445e2b74..81c68d9b5 100644
--- a/providers/intercom/session_test.go
+++ b/providers/intercom/session_test.go
@@ -1,10 +1,11 @@
 package intercom_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/intercom"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/kakao/kakao.go b/providers/kakao/kakao.go
index 8d207cfb9..f19e35ad8 100644
--- a/providers/kakao/kakao.go
+++ b/providers/kakao/kakao.go
@@ -5,12 +5,11 @@ package kakao
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"strconv"
 
-	"fmt"
-
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/line/line.go b/providers/line/line.go
index bcc919ac7..e4d2e9555 100644
--- a/providers/line/line.go
+++ b/providers/line/line.go
@@ -5,11 +5,10 @@ package line
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 
-	"fmt"
-
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/mastodon/session_test.go b/providers/mastodon/session_test.go
index cceaf20e2..04caf36b3 100644
--- a/providers/mastodon/session_test.go
+++ b/providers/mastodon/session_test.go
@@ -1,10 +1,11 @@
 package mastodon_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/mastodon"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/meetup/meetup.go b/providers/meetup/meetup.go
index 12d6ddf1a..3d1ef0c8c 100644
--- a/providers/meetup/meetup.go
+++ b/providers/meetup/meetup.go
@@ -6,12 +6,13 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"strconv"
+
+	"github.com/markbates/goth"
+	"golang.org/x/oauth2"
 )
 
 const (
diff --git a/providers/meetup/meetup_test.go b/providers/meetup/meetup_test.go
index 8a63b29f3..c3874ba3c 100644
--- a/providers/meetup/meetup_test.go
+++ b/providers/meetup/meetup_test.go
@@ -1,11 +1,12 @@
 package meetup_test
 
 import (
+	"os"
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/meetup"
 	"github.com/stretchr/testify/assert"
-	"os"
-	"testing"
 )
 
 func Test_New(t *testing.T) {
diff --git a/providers/meetup/session_test.go b/providers/meetup/session_test.go
index c284e3802..af12d412f 100644
--- a/providers/meetup/session_test.go
+++ b/providers/meetup/session_test.go
@@ -1,10 +1,11 @@
 package meetup_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/meetup"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/nextcloud/nextcloud.go b/providers/nextcloud/nextcloud.go
index cf74e59e6..23d3ee896 100644
--- a/providers/nextcloud/nextcloud.go
+++ b/providers/nextcloud/nextcloud.go
@@ -5,12 +5,11 @@ package nextcloud
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
 
-	"fmt"
-
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/okta/okta.go b/providers/okta/okta.go
index 67d04ba32..b53eae2b4 100644
--- a/providers/okta/okta.go
+++ b/providers/okta/okta.go
@@ -5,11 +5,11 @@ package okta
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
 
-	"fmt"
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/okta/session_test.go b/providers/okta/session_test.go
index 70d9827ce..36f1add33 100644
--- a/providers/okta/session_test.go
+++ b/providers/okta/session_test.go
@@ -1,10 +1,11 @@
 package okta_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/okta"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/onedrive/onedrive.go b/providers/onedrive/onedrive.go
index 0ca4e39da..3ed98739a 100644
--- a/providers/onedrive/onedrive.go
+++ b/providers/onedrive/onedrive.go
@@ -5,13 +5,12 @@ package onedrive
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 
-	"fmt"
-
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/onedrive/onedrive_test.go b/providers/onedrive/onedrive_test.go
index 0aeb923c8..68c992e06 100644
--- a/providers/onedrive/onedrive_test.go
+++ b/providers/onedrive/onedrive_test.go
@@ -1,11 +1,12 @@
 package onedrive_test
 
 import (
+	"os"
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/onedrive"
 	"github.com/stretchr/testify/assert"
-	"os"
-	"testing"
 )
 
 func Test_New(t *testing.T) {
diff --git a/providers/onedrive/session_test.go b/providers/onedrive/session_test.go
index df507a71b..344377a25 100644
--- a/providers/onedrive/session_test.go
+++ b/providers/onedrive/session_test.go
@@ -1,10 +1,11 @@
 package onedrive_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/onedrive"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/openidConnect/openidConnect_test.go b/providers/openidConnect/openidConnect_test.go
index 490eab14c..3e844359f 100644
--- a/providers/openidConnect/openidConnect_test.go
+++ b/providers/openidConnect/openidConnect_test.go
@@ -2,12 +2,13 @@ package openidConnect
 
 import (
 	"fmt"
-	"github.com/markbates/goth"
-	"github.com/stretchr/testify/assert"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"testing"
+
+	"github.com/markbates/goth"
+	"github.com/stretchr/testify/assert"
 )
 
 var (
diff --git a/providers/openidConnect/session_test.go b/providers/openidConnect/session_test.go
index 9ad231f4c..29f6b54b1 100644
--- a/providers/openidConnect/session_test.go
+++ b/providers/openidConnect/session_test.go
@@ -1,9 +1,10 @@
 package openidConnect
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/oura/oura.go b/providers/oura/oura.go
index 098f7f998..50778b53c 100644
--- a/providers/oura/oura.go
+++ b/providers/oura/oura.go
@@ -3,11 +3,10 @@ package oura
 
 import (
 	"encoding/json"
+	"fmt"
 	"io"
 	"net/http"
 
-	"fmt"
-
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/paypal/session_test.go b/providers/paypal/session_test.go
index fd6fc4766..e8b597591 100644
--- a/providers/paypal/session_test.go
+++ b/providers/paypal/session_test.go
@@ -1,10 +1,11 @@
 package paypal_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/paypal"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/salesforce/salesforce_test.go b/providers/salesforce/salesforce_test.go
index b5096e050..e983bff5a 100644
--- a/providers/salesforce/salesforce_test.go
+++ b/providers/salesforce/salesforce_test.go
@@ -1,11 +1,12 @@
 package salesforce_test
 
 import (
+	"os"
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/salesforce"
 	"github.com/stretchr/testify/assert"
-	"os"
-	"testing"
 )
 
 func Test_New(t *testing.T) {
diff --git a/providers/salesforce/session_test.go b/providers/salesforce/session_test.go
index 2ed0f8382..b0a4d9b97 100644
--- a/providers/salesforce/session_test.go
+++ b/providers/salesforce/session_test.go
@@ -1,10 +1,11 @@
 package salesforce_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/salesforce"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/seatalk/seatalk.go b/providers/seatalk/seatalk.go
index 287e32bd9..fd6161be6 100644
--- a/providers/seatalk/seatalk.go
+++ b/providers/seatalk/seatalk.go
@@ -3,13 +3,12 @@ package seatalk
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strings"
 
-	"fmt"
-
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/seatalk/seatalk_test.go b/providers/seatalk/seatalk_test.go
index 4aa8151cc..07ede5768 100644
--- a/providers/seatalk/seatalk_test.go
+++ b/providers/seatalk/seatalk_test.go
@@ -1,11 +1,12 @@
 package seatalk_test
 
 import (
+	"os"
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/seatalk"
 	"github.com/stretchr/testify/assert"
-	"os"
-	"testing"
 )
 
 func Test_New(t *testing.T) {
diff --git a/providers/seatalk/session_test.go b/providers/seatalk/session_test.go
index 0f35779eb..d6693208f 100644
--- a/providers/seatalk/session_test.go
+++ b/providers/seatalk/session_test.go
@@ -1,10 +1,11 @@
 package seatalk_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/seatalk"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/shopify/shopify.go b/providers/shopify/shopify.go
index e3d2ae8fb..9b1450680 100755
--- a/providers/shopify/shopify.go
+++ b/providers/shopify/shopify.go
@@ -5,12 +5,11 @@ package shopify
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 	"io"
 	"net/http"
 	"strconv"
 
-	"fmt"
-
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/slack/session_test.go b/providers/slack/session_test.go
index 0b57b179e..5364c1f76 100644
--- a/providers/slack/session_test.go
+++ b/providers/slack/session_test.go
@@ -1,10 +1,11 @@
 package slack_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/slack"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/slack/slack.go b/providers/slack/slack.go
index d295cf61f..efb2744a3 100644
--- a/providers/slack/slack.go
+++ b/providers/slack/slack.go
@@ -5,12 +5,11 @@ package slack
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
 
-	"fmt"
-
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/soundcloud/session_test.go b/providers/soundcloud/session_test.go
index b62107908..56e572af8 100644
--- a/providers/soundcloud/session_test.go
+++ b/providers/soundcloud/session_test.go
@@ -1,10 +1,11 @@
 package soundcloud_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/soundcloud"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/soundcloud/soundcloud.go b/providers/soundcloud/soundcloud.go
index a7bb708a1..f78b372bd 100644
--- a/providers/soundcloud/soundcloud.go
+++ b/providers/soundcloud/soundcloud.go
@@ -5,13 +5,13 @@ package soundcloud
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strconv"
 
-	"fmt"
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/soundcloud/soundcloud_test.go b/providers/soundcloud/soundcloud_test.go
index c17ab17f7..3249c21f9 100644
--- a/providers/soundcloud/soundcloud_test.go
+++ b/providers/soundcloud/soundcloud_test.go
@@ -1,11 +1,12 @@
 package soundcloud_test
 
 import (
+	"os"
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/soundcloud"
 	"github.com/stretchr/testify/assert"
-	"os"
-	"testing"
 )
 
 func Test_New(t *testing.T) {
diff --git a/providers/spotify/spotify.go b/providers/spotify/spotify.go
index ab5e5e165..2648b3cba 100644
--- a/providers/spotify/spotify.go
+++ b/providers/spotify/spotify.go
@@ -4,10 +4,10 @@ package spotify
 
 import (
 	"encoding/json"
+	"fmt"
 	"io"
 	"net/http"
 
-	"fmt"
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/steam/session_test.go b/providers/steam/session_test.go
index 5bc2be9f9..b6e945565 100644
--- a/providers/steam/session_test.go
+++ b/providers/steam/session_test.go
@@ -1,10 +1,11 @@
 package steam_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/steam"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/steam/steam_test.go b/providers/steam/steam_test.go
index a59a0c7df..f800bd0a0 100644
--- a/providers/steam/steam_test.go
+++ b/providers/steam/steam_test.go
@@ -1,11 +1,12 @@
 package steam_test
 
 import (
+	"os"
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/steam"
 	"github.com/stretchr/testify/assert"
-	"os"
-	"testing"
 )
 
 func Test_New(t *testing.T) {
diff --git a/providers/strava/strava.go b/providers/strava/strava.go
index 91442fe69..6402751af 100644
--- a/providers/strava/strava.go
+++ b/providers/strava/strava.go
@@ -6,12 +6,13 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"net/url"
+
+	"github.com/markbates/goth"
+	"golang.org/x/oauth2"
 )
 
 const (
diff --git a/providers/stripe/session_test.go b/providers/stripe/session_test.go
index ac40f2d9b..b043f11c8 100644
--- a/providers/stripe/session_test.go
+++ b/providers/stripe/session_test.go
@@ -1,10 +1,11 @@
 package stripe_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/stripe"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/stripe/stripe.go b/providers/stripe/stripe.go
index 4ac0bc6d7..33d034e67 100644
--- a/providers/stripe/stripe.go
+++ b/providers/stripe/stripe.go
@@ -4,10 +4,10 @@ package stripe
 
 import (
 	"encoding/json"
+	"fmt"
 	"io"
 	"net/http"
 
-	"fmt"
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/stripe/stripe_test.go b/providers/stripe/stripe_test.go
index ed087f5c8..8b7e7327f 100644
--- a/providers/stripe/stripe_test.go
+++ b/providers/stripe/stripe_test.go
@@ -1,11 +1,12 @@
 package stripe_test
 
 import (
+	"os"
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/stripe"
 	"github.com/stretchr/testify/assert"
-	"os"
-	"testing"
 )
 
 func Test_New(t *testing.T) {
diff --git a/providers/twitch/twitch.go b/providers/twitch/twitch.go
index a65e9db5e..939a60578 100644
--- a/providers/twitch/twitch.go
+++ b/providers/twitch/twitch.go
@@ -5,11 +5,10 @@ package twitch
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 	"io"
 	"net/http"
 
-	"fmt"
-
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/twitter/twitter.go b/providers/twitter/twitter.go
index 3d38f9f04..4e2e2c98a 100644
--- a/providers/twitter/twitter.go
+++ b/providers/twitter/twitter.go
@@ -6,11 +6,10 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 
-	"fmt"
-
 	"github.com/markbates/goth"
 	"github.com/mrjones/oauth"
 	"golang.org/x/oauth2"
diff --git a/providers/twitterv2/twitterv2.go b/providers/twitterv2/twitterv2.go
index e55743992..1dcb21292 100644
--- a/providers/twitterv2/twitterv2.go
+++ b/providers/twitterv2/twitterv2.go
@@ -6,11 +6,10 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 
-	"fmt"
-
 	"github.com/markbates/goth"
 	"github.com/mrjones/oauth"
 	"golang.org/x/oauth2"
diff --git a/providers/uber/session_test.go b/providers/uber/session_test.go
index 86b4c3aec..e8ffa0b73 100644
--- a/providers/uber/session_test.go
+++ b/providers/uber/session_test.go
@@ -1,10 +1,11 @@
 package uber_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/uber"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/uber/uber.go b/providers/uber/uber.go
index 78f806245..de48df81c 100644
--- a/providers/uber/uber.go
+++ b/providers/uber/uber.go
@@ -4,10 +4,10 @@ package uber
 
 import (
 	"encoding/json"
+	"fmt"
 	"io"
 	"net/http"
 
-	"fmt"
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/uber/uber_test.go b/providers/uber/uber_test.go
index f6bf954d7..efd2d8114 100644
--- a/providers/uber/uber_test.go
+++ b/providers/uber/uber_test.go
@@ -1,11 +1,12 @@
 package uber_test
 
 import (
+	"os"
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/uber"
 	"github.com/stretchr/testify/assert"
-	"os"
-	"testing"
 )
 
 func Test_New(t *testing.T) {
diff --git a/providers/wepay/session_test.go b/providers/wepay/session_test.go
index 4891e8848..c2a483588 100644
--- a/providers/wepay/session_test.go
+++ b/providers/wepay/session_test.go
@@ -1,10 +1,11 @@
 package wepay_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/wepay"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/wepay/wepay.go b/providers/wepay/wepay.go
index 745218622..fca319b76 100644
--- a/providers/wepay/wepay.go
+++ b/providers/wepay/wepay.go
@@ -4,12 +4,12 @@ package wepay
 
 import (
 	"encoding/json"
+	"fmt"
 	"io"
 	"net/http"
 	"strconv"
 	"strings"
 
-	"fmt"
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/wepay/wepay_test.go b/providers/wepay/wepay_test.go
index 831e14c3f..c8a322920 100644
--- a/providers/wepay/wepay_test.go
+++ b/providers/wepay/wepay_test.go
@@ -1,11 +1,12 @@
 package wepay_test
 
 import (
+	"os"
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/wepay"
 	"github.com/stretchr/testify/assert"
-	"os"
-	"testing"
 )
 
 func Test_New(t *testing.T) {
diff --git a/providers/yahoo/session_test.go b/providers/yahoo/session_test.go
index c0352e04f..8f0be485a 100644
--- a/providers/yahoo/session_test.go
+++ b/providers/yahoo/session_test.go
@@ -1,10 +1,11 @@
 package yahoo_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/yahoo"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/yahoo/yahoo.go b/providers/yahoo/yahoo.go
index 93a5ac3d8..42a172340 100644
--- a/providers/yahoo/yahoo.go
+++ b/providers/yahoo/yahoo.go
@@ -4,10 +4,10 @@ package yahoo
 
 import (
 	"encoding/json"
+	"fmt"
 	"io"
 	"net/http"
 
-	"fmt"
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/yahoo/yahoo_test.go b/providers/yahoo/yahoo_test.go
index 97506cb6a..7c42df5e2 100644
--- a/providers/yahoo/yahoo_test.go
+++ b/providers/yahoo/yahoo_test.go
@@ -1,11 +1,12 @@
 package yahoo_test
 
 import (
+	"os"
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/yahoo"
 	"github.com/stretchr/testify/assert"
-	"os"
-	"testing"
 )
 
 func Test_New(t *testing.T) {
diff --git a/providers/yammer/session_test.go b/providers/yammer/session_test.go
index c400d21e4..bb6a1d4de 100644
--- a/providers/yammer/session_test.go
+++ b/providers/yammer/session_test.go
@@ -1,10 +1,11 @@
 package yammer_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/yammer"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/yammer/yammer.go b/providers/yammer/yammer.go
index e2534edf3..f7e803ea2 100644
--- a/providers/yammer/yammer.go
+++ b/providers/yammer/yammer.go
@@ -7,11 +7,12 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"io/ioutil"
 	"net/http"
 	"strconv"
+
+	"github.com/markbates/goth"
+	"golang.org/x/oauth2"
 )
 
 const (
diff --git a/providers/yammer/yammer_test.go b/providers/yammer/yammer_test.go
index aa048991d..5d76a0150 100644
--- a/providers/yammer/yammer_test.go
+++ b/providers/yammer/yammer_test.go
@@ -1,11 +1,12 @@
 package yammer_test
 
 import (
+	"os"
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/yammer"
 	"github.com/stretchr/testify/assert"
-	"os"
-	"testing"
 )
 
 func Test_New(t *testing.T) {
diff --git a/providers/yandex/session_test.go b/providers/yandex/session_test.go
index 5e1b2d82a..c52a97e67 100644
--- a/providers/yandex/session_test.go
+++ b/providers/yandex/session_test.go
@@ -1,10 +1,11 @@
 package yandex_test
 
 import (
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/yandex"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Implements_Session(t *testing.T) {
diff --git a/providers/yandex/yandex.go b/providers/yandex/yandex.go
index 2ec168b63..e550a80f3 100644
--- a/providers/yandex/yandex.go
+++ b/providers/yandex/yandex.go
@@ -5,11 +5,11 @@ package yandex
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
 
-	"fmt"
 	"github.com/markbates/goth"
 	"golang.org/x/oauth2"
 )
diff --git a/providers/yandex/yandex_test.go b/providers/yandex/yandex_test.go
index 96d77bd8b..c37ea3a16 100644
--- a/providers/yandex/yandex_test.go
+++ b/providers/yandex/yandex_test.go
@@ -1,11 +1,12 @@
 package yandex_test
 
 import (
+	"os"
+	"testing"
+
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/providers/yandex"
 	"github.com/stretchr/testify/assert"
-	"os"
-	"testing"
 )
 
 func Test_New(t *testing.T) {