diff --git a/pkg/services/sqlstore/accounts_test.go b/pkg/services/sqlstore/accounts_test.go
index 50341c6bbd4..2d0b87973cd 100644
--- a/pkg/services/sqlstore/accounts_test.go
+++ b/pkg/services/sqlstore/accounts_test.go
@@ -30,6 +30,16 @@ func TestAccountDataAccess(t *testing.T) {
 
 				So(err, ShouldBeNil)
 				So(query.Result.Email, ShouldEqual, "ac1@test.com")
+				So(query.Result.Login, ShouldEqual, "ac1")
+			})
+
+			Convey("Can search accounts", func() {
+				query := m.SearchAccountsQuery{Query: ""}
+				err := SearchAccounts(&query)
+
+				So(err, ShouldBeNil)
+				So(query.Result[0].Email, ShouldEqual, "ac1@test.com")
+				So(query.Result[1].Email, ShouldEqual, "ac2@test.com")
 			})
 
 			Convey("Can add collaborator", func() {
@@ -44,16 +54,6 @@ func TestAccountDataAccess(t *testing.T) {
 					So(err, ShouldBeNil)
 				})
 
-				Convey("Collaborator should be included in account info projection", func() {
-					query := m.GetAccountInfoQuery{Id: ac1.Id}
-					err = GetAccountInfo(&query)
-
-					So(err, ShouldBeNil)
-					So(query.Result.Collaborators[0].CollaboratorId, ShouldEqual, ac2.Id)
-					So(query.Result.Collaborators[0].Role, ShouldEqual, m.ROLE_READ_WRITE)
-					So(query.Result.Collaborators[0].Email, ShouldEqual, "ac2@test.com")
-				})
-
 				Convey("Can get other accounts", func() {
 					query := m.GetOtherAccountsQuery{AccountId: ac2.Id}
 					err := GetOtherAccounts(&query)
diff --git a/pkg/services/sqlstore/tokens.go b/pkg/services/sqlstore/tokens.go
index 2db57054afc..8603f43f08a 100644
--- a/pkg/services/sqlstore/tokens.go
+++ b/pkg/services/sqlstore/tokens.go
@@ -1,10 +1,11 @@
 package sqlstore
 
 import (
+	"time"
+
 	"github.com/go-xorm/xorm"
 	"github.com/torkelo/grafana-pro/pkg/bus"
 	m "github.com/torkelo/grafana-pro/pkg/models"
-	"time"
 )
 
 func init() {
@@ -30,7 +31,6 @@ func DeleteToken(cmd *m.DeleteTokenCommand) error {
 }
 
 func AddToken(cmd *m.AddTokenCommand) error {
-
 	return inTransaction(func(sess *xorm.Session) error {
 		t := m.Token{
 			AccountId: cmd.AccountId,