diff --git a/server/monitor.go b/server/monitor.go
index 3e6feb03..de38bb0b 100644
--- a/server/monitor.go
+++ b/server/monitor.go
@@ -113,14 +113,14 @@ func castToSliceString(input []interface{}) []string {
 	return output
 }
 
-// Connz represents detail information on current connections.
+// Subsz represents detail information on current connections.
 type Subsz struct {
-	SubjectStats *sublist.Stats `json:"stats"`
+	SubjectStats sublist.Stats `json:"stats"`
 }
 
 // HandleStats process HTTP requests for subjects stats.
 func (s *Server) HandleSubsz(w http.ResponseWriter, r *http.Request) {
-	st := &Subsz{SubjectStats: s.sl.Stats()}
+	st := &Subsz{SubjectStats: *s.sl.Stats()}
 
 	b, err := json.MarshalIndent(st, "", "  ")
 	if err != nil {
diff --git a/server/monitor_test.go b/server/monitor_test.go
new file mode 100644
index 00000000..41a10b3e
--- /dev/null
+++ b/server/monitor_test.go
@@ -0,0 +1,343 @@
+// Copyright 2015 Apcera Inc. All rights reserved.
+
+package server
+
+import (
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"testing"
+	"time"
+
+	"github.com/apcera/nats"
+)
+
+const CLIENT_PORT = 11224
+const MONITOR_PORT = 11424
+
+var DefaultMonitorOptions = Options{
+	Host:     "localhost",
+	Port:     CLIENT_PORT,
+	HTTPPort: MONITOR_PORT,
+	NoLog:    true,
+	NoSigs:   true,
+}
+
+func runMonitorServer(monitorPort int) *Server {
+	resetPreviousHTTPConnections()
+	opts := DefaultMonitorOptions
+	opts.HTTPPort = monitorPort
+	return RunServer(&opts)
+}
+
+func resetPreviousHTTPConnections() {
+	http.DefaultTransport = &http.Transport{}
+}
+
+// Make sure that we do not run the http server for monitoring unless asked.
+func TestNoMonitorPort(t *testing.T) {
+	s := runMonitorServer(0)
+	defer s.Shutdown()
+
+	url := fmt.Sprintf("http://localhost:%d/", DEFAULT_HTTP_PORT)
+	if resp, err := http.Get(url + "varz"); err == nil {
+		t.Fatalf("Expected error: Got %+v\n", resp)
+	}
+	if resp, err := http.Get(url + "healthz"); err == nil {
+		t.Fatalf("Expected error: Got %+v\n", resp)
+	}
+	if resp, err := http.Get(url + "connz"); err == nil {
+		t.Fatalf("Expected error: Got %+v\n", resp)
+	}
+}
+
+func TestVarz(t *testing.T) {
+	s := runMonitorServer(DEFAULT_HTTP_PORT)
+	defer s.Shutdown()
+
+	url := fmt.Sprintf("http://localhost:%d/", DEFAULT_HTTP_PORT)
+	resp, err := http.Get(url + "varz")
+	if err != nil {
+		t.Fatalf("Expected no error: Got %v\n", err)
+	}
+	if resp.StatusCode != 200 {
+		t.Fatalf("Expected a 200 response, got %d\n", resp.StatusCode)
+	}
+	defer resp.Body.Close()
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		t.Fatalf("Got an error reading the body: %v\n", err)
+	}
+
+	v := Varz{}
+	if err := json.Unmarshal(body, &v); err != nil {
+		t.Fatalf("Got an error unmarshalling the body: %v\n", err)
+	}
+
+	// Do some sanity checks on values
+	if time.Since(v.Start) > 10*time.Second {
+		t.Fatal("Expected start time to be within 10 seconds.")
+	}
+
+	nc := createClientConnSubscribeAndPublish(t)
+	defer nc.Close()
+
+	resp, err = http.Get(url + "varz")
+	if err != nil {
+		t.Fatalf("Expected no error: Got %v\n", err)
+	}
+	if resp.StatusCode != 200 {
+		t.Fatalf("Expected a 200 response, got %d\n", resp.StatusCode)
+	}
+	defer resp.Body.Close()
+	body, err = ioutil.ReadAll(resp.Body)
+	if err != nil {
+		t.Fatalf("Got an error reading the body: %v\n", err)
+	}
+
+	v = Varz{}
+	if err := json.Unmarshal(body, &v); err != nil {
+		t.Fatalf("Got an error unmarshalling the body: %v\n", err)
+	}
+
+	if v.Connections != 1 {
+		t.Fatalf("Expected Connections of 1, got %v\n", v.Connections)
+	}
+	if v.InMsgs != 1 {
+		t.Fatalf("Expected InMsgs of 1, got %v\n", v.InMsgs)
+	}
+	if v.OutMsgs != 1 {
+		t.Fatalf("Expected OutMsgs of 1, got %v\n", v.OutMsgs)
+	}
+	if v.InBytes != 5 {
+		t.Fatalf("Expected InBytes of 5, got %v\n", v.InBytes)
+	}
+	if v.OutBytes != 5 {
+		t.Fatalf("Expected OutBytes of 5, got %v\n", v.OutBytes)
+	}
+}
+
+func TestConnz(t *testing.T) {
+	s := runMonitorServer(DEFAULT_HTTP_PORT)
+	defer s.Shutdown()
+
+	url := fmt.Sprintf("http://localhost:%d/", DEFAULT_HTTP_PORT)
+	resp, err := http.Get(url + "connz")
+	if err != nil {
+		t.Fatalf("Expected no error: Got %v\n", err)
+	}
+	if resp.StatusCode != 200 {
+		t.Fatalf("Expected a 200 response, got %d\n", resp.StatusCode)
+	}
+	defer resp.Body.Close()
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		t.Fatalf("Got an error reading the body: %v\n", err)
+	}
+
+	c := Connz{}
+	if err := json.Unmarshal(body, &c); err != nil {
+		t.Fatalf("Got an error unmarshalling the body: %v\n", err)
+	}
+
+	// Test contents..
+	if c.NumConns != 0 {
+		t.Fatalf("Expected 0 connections, got %d\n", c.NumConns)
+	}
+	if c.Conns == nil || len(c.Conns) != 0 {
+		t.Fatalf("Expected 0 connections in array, got %p\n", c.Conns)
+	}
+
+	nc := createClientConnSubscribeAndPublish(t)
+	defer nc.Close()
+
+	resp, err = http.Get(url + "connz")
+	if err != nil {
+		t.Fatalf("Expected no error: Got %v\n", err)
+	}
+	if resp.StatusCode != 200 {
+		t.Fatalf("Expected a 200 response, got %d\n", resp.StatusCode)
+	}
+	defer resp.Body.Close()
+	body, err = ioutil.ReadAll(resp.Body)
+	if err != nil {
+		t.Fatalf("Got an error reading the body: %v\n", err)
+	}
+	if err := json.Unmarshal(body, &c); err != nil {
+		t.Fatalf("Got an error unmarshalling the body: %v\n", err)
+	}
+
+	if c.NumConns != 1 {
+		t.Fatalf("Expected 1 connections, got %d\n", c.NumConns)
+	}
+	if c.Conns == nil || len(c.Conns) != 1 {
+		t.Fatalf("Expected 1 connections in array, got %p\n", c.Conns)
+	}
+
+	if c.Limit != DefaultConnListSize {
+		t.Fatalf("Expected limit of %d, got %v\n", DefaultConnListSize, c.Limit)
+	}
+
+	if c.Offset != 0 {
+		t.Fatalf("Expected offset of 0, got %v\n", c.Offset)
+	}
+
+	// Test inside details of each connection
+	ci := c.Conns[0]
+
+	if ci.Cid == 0 {
+		t.Fatalf("Expected non-zero cid, got %v\n", ci.Cid)
+	}
+	if ci.IP != "127.0.0.1" {
+		t.Fatalf("Expected \"127.0.0.1\" for IP, got %v\n", ci.IP)
+	}
+	if ci.Port == 0 {
+		t.Fatalf("Expected non-zero port, got %v\n", ci.Port)
+	}
+	if ci.NumSubs != 1 {
+		t.Fatalf("Expected num_subs of 1, got %v\n", ci.NumSubs)
+	}
+	if len(ci.Subs) != 0 {
+		t.Fatalf("Expected subs of 0, got %v\n", ci.Subs)
+	}
+	if ci.InMsgs != 1 {
+		t.Fatalf("Expected InMsgs of 1, got %v\n", ci.InMsgs)
+	}
+	if ci.OutMsgs != 1 {
+		t.Fatalf("Expected OutMsgs of 1, got %v\n", ci.OutMsgs)
+	}
+	if ci.InBytes != 5 {
+		t.Fatalf("Expected InBytes of 1, got %v\n", ci.InBytes)
+	}
+	if ci.OutBytes != 5 {
+		t.Fatalf("Expected OutBytes of 1, got %v\n", ci.OutBytes)
+	}
+}
+
+func TestConnzWithSubs(t *testing.T) {
+	s := runMonitorServer(DEFAULT_HTTP_PORT)
+	defer s.Shutdown()
+
+	nc := createClientConnSubscribeAndPublish(t)
+	defer nc.Close()
+
+	url := fmt.Sprintf("http://localhost:%d/", DEFAULT_HTTP_PORT)
+	resp, err := http.Get(url + "connz?subs=1")
+	if err != nil {
+		t.Fatalf("Expected no error: Got %v\n", err)
+	}
+	if resp.StatusCode != 200 {
+		t.Fatalf("Expected a 200 response, got %d\n", resp.StatusCode)
+	}
+	defer resp.Body.Close()
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		t.Fatalf("Got an error reading the body: %v\n", err)
+	}
+
+	c := Connz{}
+	if err := json.Unmarshal(body, &c); err != nil {
+		t.Fatalf("Got an error unmarshalling the body: %v\n", err)
+	}
+
+	// Test inside details of each connection
+	ci := c.Conns[0]
+	if len(ci.Subs) != 1 || ci.Subs[0] != "foo" {
+		t.Fatalf("Expected subs of 1, got %v\n", ci.Subs)
+	}
+}
+
+func TestConnzWithOffsetAndLimit(t *testing.T) {
+	s := runMonitorServer(DEFAULT_HTTP_PORT)
+	defer s.Shutdown()
+
+	cl1 := createClientConnSubscribeAndPublish(t)
+	defer cl1.Close()
+
+	cl2 := createClientConnSubscribeAndPublish(t)
+	defer cl2.Close()
+
+	url := fmt.Sprintf("http://localhost:%d/", DEFAULT_HTTP_PORT)
+	resp, err := http.Get(url + "connz?offset=1&limit=1")
+	if err != nil {
+		t.Fatalf("Expected no error: Got %v\n", err)
+	}
+	if resp.StatusCode != 200 {
+		t.Fatalf("Expected a 200 response, got %d\n", resp.StatusCode)
+	}
+	defer resp.Body.Close()
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		t.Fatalf("Got an error reading the body: %v\n", err)
+	}
+
+	c := Connz{}
+	if err := json.Unmarshal(body, &c); err != nil {
+		t.Fatalf("Got an error unmarshalling the body: %v\n", err)
+	}
+
+	if c.Limit != 1 {
+		t.Fatalf("Expected limit of 1, got %v\n", c.Limit)
+	}
+
+	if c.Offset != 1 {
+		t.Fatalf("Expected offset of 1, got %v\n", c.Offset)
+	}
+
+	if len(c.Conns) != 1 {
+		t.Fatalf("Expected conns of 1, got %v\n", len(c.Conns))
+	}
+}
+
+func TestSubsz(t *testing.T) {
+	s := runMonitorServer(DEFAULT_HTTP_PORT)
+	defer s.Shutdown()
+
+	nc := createClientConnSubscribeAndPublish(t)
+	defer nc.Close()
+
+	url := fmt.Sprintf("http://localhost:%d/", DEFAULT_HTTP_PORT)
+	resp, err := http.Get(url + "subscriptionsz")
+	if err != nil {
+		t.Fatalf("Expected no error: Got %v\n", err)
+	}
+	if resp.StatusCode != 200 {
+		t.Fatalf("Expected a 200 response, got %d\n", resp.StatusCode)
+	}
+	defer resp.Body.Close()
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		t.Fatalf("Got an error reading the body: %v\n", err)
+	}
+	sl := Subsz{}
+	if err := json.Unmarshal(body, &sl); err != nil {
+		t.Fatalf("Got an error unmarshalling the body: %v\n", err)
+	}
+
+	if sl.SubjectStats.NumSubs != 1 {
+		t.Fatalf("Expected NumSubs of 1, got %d\n", sl.SubjectStats.NumSubs)
+	}
+	if sl.SubjectStats.NumInserts != 1 {
+		t.Fatalf("Expected NumInserts of 1, got %d\n", sl.SubjectStats.NumInserts)
+	}
+	if sl.SubjectStats.NumMatches != 1 {
+		t.Fatalf("Expected NumMatches of 1, got %d\n", sl.SubjectStats.NumMatches)
+	}
+
+}
+
+// Create a connection to test ConnInfo
+func createClientConnSubscribeAndPublish(t *testing.T) *nats.Conn {
+	nc, err := nats.Connect(fmt.Sprintf("nats://localhost:%d", CLIENT_PORT))
+	if err != nil {
+		t.Fatalf("Error creating client: %v\n", err)
+	}
+
+	ch := make(chan bool)
+	nc.Subscribe("foo", func(m *nats.Msg) { ch <- true })
+	nc.Publish("foo", []byte("Hello"))
+	// Wait for message
+	<-ch
+	return nc
+}
diff --git a/test/monitor_test.go b/test/monitor_test.go
index e33b5db4..7266a786 100644
--- a/test/monitor_test.go
+++ b/test/monitor_test.go
@@ -17,7 +17,7 @@ import (
 const MONITOR_PORT = 11422
 
 func runMonitorServer(monitorPort int) *server.Server {
-	resetPreviuosHTTPConnections()
+	resetPreviousHTTPConnections()
 	opts := DefaultTestOptions
 	opts.Port = MONITOR_PORT
 	opts.HTTPPort = monitorPort
@@ -25,7 +25,7 @@ func runMonitorServer(monitorPort int) *server.Server {
 	return RunServer(&opts)
 }
 
-func resetPreviuosHTTPConnections() {
+func resetPreviousHTTPConnections() {
 	http.DefaultTransport = &http.Transport{}
 }