--- a/cmd/gondole-cli/config_test.go	Sat Apr 15 21:08:34 2017 +0200
+++ b/cmd/gondole-cli/config_test.go	Sat Apr 15 21:08:34 2017 +0200
@@ -52,10 +52,11 @@
 	assert.NoError(t, err, "should be fine")
 
 	real := &Server{
-		ID:          "666",
+		ID:          "666abcdef666",
 		Name:        "foo",
 		BearerToken: "d3b07384d113edec49eaa6238ad5ff00",
-		BaseURL:     "https://mastodon.social",
+		APIBase:     "https://mastodon.social/api/v1",
+		InstanceURL: "https://mastodon.social",
 	}
 	file = filepath.Join("test", "foo")
 	s, err := loadInstance(file)
@@ -102,4 +103,4 @@
 	err = os.Chmod(filepath.Join("test", "config.toml"), 0600)
 	assert.NoError(t, err, "should be fine")
 
-}
\ No newline at end of file
+}

--- a/cmd/gondole-cli/test/foo.token	Sat Apr 15 21:08:34 2017 +0200
+++ b/cmd/gondole-cli/test/foo.token	Sat Apr 15 21:08:34 2017 +0200
@@ -1,4 +1,5 @@
-id = "666"
+id = "666abcdef666"
 name = "foo"
 bearer_token = "d3b07384d113edec49eaa6238ad5ff00"
-base_URL = "https://mastodon.social"
\ No newline at end of file
+api_base = "https://mastodon.social/api/v1"
+instance_url = "https://mastodon.social"