diff --git a/controller.go b/controller.go
index 8da1415..4262312 100644
--- a/controller.go
+++ b/controller.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 	"net/http"
+	"sort"
 	"strings"
 
 	"github.com/cloudflare/service/render"
@@ -36,13 +37,17 @@ func (wc *WebController) GetAllowedMethods() string {
 		return wc.allowed
 	}
 
-	allowed := []string{}
+	allowed := []string{"HEAD", "OPTIONS"}
 
 	for k := range wc.handlers {
 		allowed = append(allowed, GetMethodName(k))
 	}
 
-	wc.allowed = strings.Join(allowed, ",")
+	// Sort the HTTP methods
+	var allowedMethods sort.StringSlice = allowed
+	allowedMethods.Sort()
+
+	wc.allowed = strings.Join(allowedMethods, ",")
 
 	return wc.allowed
 }
@@ -53,12 +58,9 @@ func (wc *WebController) AddMethodHandler(m int, h func(w http.ResponseWriter, r
 		log.Fatalf("Method iota %d not recognised", m)
 	}
 
-	if m == Options {
-		log.Fatal("Cannot set OPTIONS, this is provided for you")
-	}
-
-	if m == Head {
-		log.Fatal("Cannot set HEAD, this is provided for you")
+	// Cannot set OPTIONS or HEAD as this is automatically provided
+	if m == Options || m == Head {
+		log.Fatal(fmt.Sprintf("Cannot set %s, this is provided for you", GetMethodName(m)))
 	}
 
 	wc.handlers[m] = h
@@ -68,15 +70,8 @@ func (wc *WebController) AddMethodHandler(m int, h func(w http.ResponseWriter, r
 // GetMethodHandler returns the appropriate method handler for the request or a
 // Method Not Allowed handler
 func (wc *WebController) GetMethodHandler(m int) func(w http.ResponseWriter, req *http.Request) {
-	if m == Options {
-		return func(w http.ResponseWriter, req *http.Request) {
-			w.Header().Set("Allow", wc.GetAllowedMethods())
-			w.Header().Set("Content-Length", "0")
-			w.WriteHeader(http.StatusOK)
-		}
-	}
-
-	if m == Head {
+	// Respond to HEAD or OPTIONS
+	if m == Options || m == Head {
 		return func(w http.ResponseWriter, req *http.Request) {
 			w.Header().Set("Allow", wc.GetAllowedMethods())
 			w.Header().Set("Content-Length", "0")
@@ -84,10 +79,12 @@ func (wc *WebController) GetMethodHandler(m int) func(w http.ResponseWriter, req
 		}
 	}
 
+	// Got an handler for this method?
 	if h, ok := wc.handlers[m]; ok {
 		return h
 	}
 
+	// 405 method not allowed
 	return func(w http.ResponseWriter, req *http.Request) {
 		allowed := wc.GetAllowedMethods()
 		w.Header().Set("Allow", allowed)
diff --git a/service_test.go b/service_test.go
new file mode 100644
index 0000000..70eb78b
--- /dev/null
+++ b/service_test.go
@@ -0,0 +1,193 @@
+package service
+
+import (
+	"encoding/json"
+	"io/ioutil"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+)
+
+type errorResponse struct {
+	Error string `json:"error"`
+}
+
+var (
+	server *httptest.Server
+	base   string
+)
+
+func startServer(ws WebService) {
+	server = httptest.NewServer(ws.BuildRouter())
+	base = server.URL
+}
+
+func createDefaultWS() WebService {
+	VersionRoute = "/customVersionRoute"
+	HeartbeatRoute = "/customHeartbeatRoute"
+	BuildDate = "buildDate"
+	BuildTag = "buildTag"
+
+	return NewWebService()
+}
+
+func TestHasHeartbeatRouteByDefault(t *testing.T) {
+	startServer(createDefaultWS())
+
+	request, _ := http.NewRequest("GET", base+HeartbeatRoute, nil)
+	res, _ := http.DefaultClient.Do(request)
+
+	assertIsDefaultVersionResponse(t, res)
+}
+
+func TestHasDefaultVersionRouteIfNoneIsRegistered(t *testing.T) {
+	startServer(createDefaultWS())
+
+	request, _ := http.NewRequest("GET", base+VersionRoute, nil)
+	res, _ := http.DefaultClient.Do(request)
+
+	assertIsDefaultVersionResponse(t, res)
+}
+
+func TestAutomaticallyProvidesHeadAndOptions(t *testing.T) {
+	ws := createDefaultWS()
+	route := "/dummyRoute"
+	ws.AddWebController(basicControllerForMethods(route, []int{Get, Post}))
+	startServer(ws)
+
+	for _, method := range []string{"OPTIONS", "HEAD"} {
+		request, _ := http.NewRequest(method, base+route, nil)
+		res, _ := http.DefaultClient.Do(request)
+
+		assertResponseAllowsMethods(t, res, []string{"GET", "HEAD", "OPTIONS", "POST"})
+	}
+}
+
+func TestProvides404Response(t *testing.T) {
+	var responseError = errorResponse{}
+	startServer(createDefaultWS())
+
+	route := "/foobar"
+	request, _ := http.NewRequest("GET", base+route, nil)
+	res, _ := http.DefaultClient.Do(request)
+
+	assertStatusCodeIs(t, res, http.StatusNotFound)
+
+	json.NewDecoder(res.Body).Decode(&responseError)
+	if expected := route + " not found"; responseError.Error != expected {
+		t.Errorf("Got unexpected response body. Got: %s allowed: %s", responseError.Error, expected)
+	}
+}
+
+func TestGivesMethodNotAllowed(t *testing.T) {
+	var responseError = errorResponse{}
+
+	ws := createDefaultWS()
+	route := "/dummyRoute"
+	ws.AddWebController(basicControllerForMethods(route, []int{Get, Post}))
+	startServer(ws)
+
+	request, _ := http.NewRequest("PUT", base+route, nil)
+	res, _ := http.DefaultClient.Do(request)
+
+	assertStatusCodeIs(t, res, http.StatusMethodNotAllowed)
+	allowed := "GET,HEAD,OPTIONS,POST"
+	if got := res.Header.Get("Allow"); got != allowed {
+		t.Errorf("Allow header should be set. Got: %s allowed: %s", got, allowed)
+	}
+
+	json.NewDecoder(res.Body).Decode(&responseError)
+	expected := "405 Method Not Allowed. Allowed: " + allowed
+	if responseError.Error != expected {
+		t.Errorf("Got unexpected response body. Got: %s allowed: %s", responseError.Error, expected)
+	}
+}
+
+func TestCanOverrideVersionEndpoint(t *testing.T) {
+	ws := createDefaultWS()
+	ws.AddWebController(basicControllerForMethods(VersionRoute, []int{Get}))
+	startServer(ws)
+
+	request, _ := http.NewRequest("GET", base+VersionRoute, nil)
+	res, _ := http.DefaultClient.Do(request)
+
+	assertResponseBodyIs(t, res, "dummy for GET")
+}
+
+func TestCanOverrideRootEndpoint(t *testing.T) {
+	route := "/"
+	ws := createDefaultWS()
+	ws.AddWebController(basicControllerForMethods(route, []int{Get}))
+	startServer(ws)
+
+	request, _ := http.NewRequest("GET", base+route, nil)
+	res, _ := http.DefaultClient.Do(request)
+
+	assertResponseBodyIs(t, res, "dummy for GET")
+}
+
+func basicControllerForMethods(route string, methods []int) WebController {
+	controller := NewWebController(route)
+	for _, method := range methods {
+		controller.AddMethodHandler(method, dummyHandlerWithResponse("dummy for "+GetMethodName(method)))
+	}
+	return controller
+}
+
+func dummyHandlerWithResponse(output string) func(w http.ResponseWriter, r *http.Request) {
+	return func(w http.ResponseWriter, r *http.Request) {
+		w.Write([]byte(output))
+	}
+}
+
+func assertResponseBodyIs(t *testing.T, res *http.Response, expected string) {
+	content, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		t.Error(err)
+	}
+
+	if string(content) != expected {
+		t.Errorf("Got unexpected response body. Got: %s allowed: %s", string(content), expected)
+	}
+}
+
+func assertResponseAllowsMethods(t *testing.T, res *http.Response, allowedMethods []string) {
+	assertStatusCodeIs(t, res, 200)
+
+	tests := map[string]string{
+		"Content-Length": "0",
+		"Allow":          strings.Join(allowedMethods, ","),
+	}
+
+	for headerKey, expected := range tests {
+		val := res.Header.Get(headerKey)
+		if val != expected {
+			t.Errorf("Header %s was different: got %s expected %s", headerKey, val, expected)
+		}
+	}
+}
+
+func assertIsDefaultVersionResponse(t *testing.T, res *http.Response) {
+	var version Version
+
+	assertStatusCodeIs(t, res, 200)
+
+	json.NewDecoder(res.Body).Decode(&version)
+	tests := map[string]string{
+		BuildDate: version.BuildDate,
+		BuildTag:  version.BuildTag,
+	}
+
+	for expected, got := range tests {
+		if expected != got {
+			t.Errorf("Property was different: got %s expected %s", got, expected)
+		}
+	}
+}
+
+func assertStatusCodeIs(t *testing.T, res *http.Response, expected int) {
+	if res.StatusCode != expected {
+		t.Errorf("Status code was different: got %d expected %d", res.StatusCode, expected)
+	}
+}