diff --git a/gnatsd.go b/gnatsd.go
index 0885f030..1677437e 100644
--- a/gnatsd.go
+++ b/gnatsd.go
@@ -82,9 +82,9 @@ func main() {
 		s.StartHTTPMonitoring()
 	}
 
-	// Start up clustering as well if needed.
+	// Start up routing as well if needed.
 	if mOpts.ClusterPort != 0 {
-		s.StartCluster()
+		s.StartRouting()
 	}
 
 	// Profiler
diff --git a/server/opts_test.go b/server/opts_test.go
index 1a5d97bc..58cf03fb 100644
--- a/server/opts_test.go
+++ b/server/opts_test.go
@@ -35,7 +35,7 @@ func TestConfigFile(t *testing.T) {
 		Port:        4242,
 		Username:    "derek",
 		Password:    "bella",
-		AuthTimeout: 1.0 / float64(time.Second),
+		AuthTimeout: 1.0,
 		Debug:       false,
 		Trace:       true,
 		Logtime:     false,
@@ -57,7 +57,7 @@ func TestMergeOverrides(t *testing.T) {
 		Port:        2222,
 		Username:    "derek",
 		Password:    "spooky",
-		AuthTimeout: 1.0 / float64(time.Second),
+		AuthTimeout: 1.0,
 		Debug:       true,
 		Trace:       true,
 		Logtime:     false,