diff --git a/.gitignore b/.gitignore
index f70b01c7..09ec77ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 .idea
-cmd/rice-box.go
+core/rice-box.go
 config.yml
 statup.db
 plugins/*.so
diff --git a/handlers/handlers_test.go b/handlers/handlers_test.go
index a0da2412..aabb6e39 100644
--- a/handlers/handlers_test.go
+++ b/handlers/handlers_test.go
@@ -1,17 +1,305 @@
 package handlers
 
 import (
+	"github.com/hunterlong/statup/core"
+	"github.com/hunterlong/statup/utils"
 	"github.com/stretchr/testify/assert"
 	"net/http"
 	"net/http/httptest"
+	"net/url"
+	"strings"
 	"testing"
 )
 
+func init() {
+	utils.InitLogs()
+	core.RenderBoxes()
+}
+
 func TestIndexHandler(t *testing.T) {
 	req, err := http.NewRequest("GET", "/", nil)
 	assert.Nil(t, err)
 	rr := httptest.NewRecorder()
 	Router().ServeHTTP(rr, req)
-
 	assert.Equal(t, 303, rr.Code)
 }
+
+func TestSetupHandler(t *testing.T) {
+	req, err := http.NewRequest("GET", "/setup", nil)
+	assert.Nil(t, err)
+	rr := httptest.NewRecorder()
+	Router().ServeHTTP(rr, req)
+	body := rr.Body.String()
+	assert.Equal(t, 200, rr.Code)
+	assert.Contains(t, body, "<title>Statup | Setup</title>")
+}
+
+func TestProcessSetupHandler(t *testing.T) {
+	form := url.Values{}
+	form.Add("db_host", "")
+	form.Add("db_user", "")
+	form.Add("db_password", "")
+	form.Add("db_database", "")
+	form.Add("db_connection", "sqlite")
+	form.Add("db_port", "")
+	form.Add("project", "Tester")
+	form.Add("username", "admin")
+	form.Add("password", "password123")
+	form.Add("sample_data", "on")
+	form.Add("description", "This is an awesome test")
+	form.Add("domain", "http://localhost:8080")
+	form.Add("email", "info@statup.io")
+	req, err := http.NewRequest("POST", "/setup", strings.NewReader(form.Encode()))
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	assert.Nil(t, err)
+	rr := httptest.NewRecorder()
+	Router().ServeHTTP(rr, req)
+	assert.Equal(t, 303, rr.Code)
+}
+
+func TestCheckIndexHandler(t *testing.T) {
+	req, err := http.NewRequest("GET", "/", nil)
+	assert.Nil(t, err)
+	rr := httptest.NewRecorder()
+	Router().ServeHTTP(rr, req)
+	assert.Equal(t, 200, rr.Code)
+}
+
+func TestServicesViewHandler(t *testing.T) {
+	req, err := http.NewRequest("GET", "/service/1", nil)
+	assert.Nil(t, err)
+	rr := httptest.NewRecorder()
+	Router().ServeHTTP(rr, req)
+	body := rr.Body.String()
+	assert.Equal(t, 200, rr.Code)
+	assert.Contains(t, body, "<title>Statup | Google Service</title>")
+	assert.Contains(t, body, "Statup  made with ❤️")
+}
+
+func TestDashboardHandler(t *testing.T) {
+	req, err := http.NewRequest("GET", "/dashboard", nil)
+	assert.Nil(t, err)
+	rr := httptest.NewRecorder()
+	Router().ServeHTTP(rr, req)
+	body := rr.Body.String()
+	assert.Equal(t, 200, rr.Code)
+	assert.Contains(t, body, "<title>Statup | Dashboard</title>")
+	assert.Contains(t, body, "Statup  made with ❤️")
+}
+
+func TestLoginHandler(t *testing.T) {
+	form := url.Values{}
+	form.Add("username", "admin")
+	form.Add("password", "password123")
+	req, err := http.NewRequest("POST", "/dashboard", strings.NewReader(form.Encode()))
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	assert.Nil(t, err)
+	rr := httptest.NewRecorder()
+	Router().ServeHTTP(rr, req)
+	assert.Equal(t, 303, rr.Code)
+}
+
+func TestServicesHandler(t *testing.T) {
+	req, err := http.NewRequest("GET", "/services", nil)
+	assert.Nil(t, err)
+	rr := httptest.NewRecorder()
+	Router().ServeHTTP(rr, req)
+	body := rr.Body.String()
+	assert.Equal(t, 200, rr.Code)
+	assert.Contains(t, body, "<title>Statup | Services</title>")
+	assert.Contains(t, body, "Statup  made with ❤️")
+}
+
+func TestCreateUserHandler(t *testing.T) {
+	form := url.Values{}
+	form.Add("username", "newuser")
+	form.Add("password", "password123")
+	form.Add("email", "info@okokk.com")
+	form.Add("admin", "on")
+	req, err := http.NewRequest("POST", "/users", strings.NewReader(form.Encode()))
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	assert.Nil(t, err)
+	rr := httptest.NewRecorder()
+	Router().ServeHTTP(rr, req)
+	assert.Equal(t, 303, rr.Code)
+}
+
+func TestUsersHandler(t *testing.T) {
+	req, err := http.NewRequest("GET", "/users", nil)
+	assert.Nil(t, err)
+	rr := httptest.NewRecorder()
+	Router().ServeHTTP(rr, req)
+	body := rr.Body.String()
+	assert.Equal(t, 200, rr.Code)
+	assert.Contains(t, body, "<title>Statup | Users</title>")
+	assert.Contains(t, body, "<td>admin</td>")
+	assert.Contains(t, body, "<td>newuser</td>")
+	assert.Contains(t, body, "Statup  made with ❤️")
+}
+
+func TestSettingsHandler(t *testing.T) {
+	req, err := http.NewRequest("GET", "/settings", nil)
+	assert.Nil(t, err)
+	rr := httptest.NewRecorder()
+	Router().ServeHTTP(rr, req)
+	body := rr.Body.String()
+	assert.Equal(t, 200, rr.Code)
+	assert.Contains(t, body, "<title>Statup | Settings</title>")
+	assert.Contains(t, body, "Statup  made with ❤️")
+}
+
+func TestHelpHandler(t *testing.T) {
+	req, err := http.NewRequest("GET", "/help", nil)
+	assert.Nil(t, err)
+	rr := httptest.NewRecorder()
+	Router().ServeHTTP(rr, req)
+	body := rr.Body.String()
+	assert.Equal(t, 200, rr.Code)
+	assert.Contains(t, body, "<title>Statup | Help</title>")
+	assert.Contains(t, body, "Statup  made with ❤️")
+}
+
+func TestCreateHTTPServiceHandler(t *testing.T) {
+	form := url.Values{}
+	form.Add("name", "Crystal Castles - Kept")
+	form.Add("domain", "https://www.youtube.com/watch?v=CfbCLwNlGwU")
+	form.Add("method", "GET")
+	form.Add("expected_status", "200")
+	form.Add("interval", "30")
+	form.Add("port", "")
+	form.Add("timeout", "30")
+	form.Add("check_type", "http")
+	form.Add("post_data", "")
+
+	req, err := http.NewRequest("POST", "/services", strings.NewReader(form.Encode()))
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	assert.Nil(t, err)
+	rr := httptest.NewRecorder()
+	Router().ServeHTTP(rr, req)
+	assert.Equal(t, 303, rr.Code)
+}
+
+func TestCreateTCPerviceHandler(t *testing.T) {
+	form := url.Values{}
+	form.Add("name", "Local Postgres")
+	form.Add("domain", "localhost")
+	form.Add("method", "GET")
+	form.Add("expected_status", "")
+	form.Add("interval", "30")
+	form.Add("port", "5432")
+	form.Add("timeout", "30")
+	form.Add("check_type", "tcp")
+	form.Add("post_data", "")
+
+	req, err := http.NewRequest("POST", "/services", strings.NewReader(form.Encode()))
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	assert.Nil(t, err)
+	rr := httptest.NewRecorder()
+	Router().ServeHTTP(rr, req)
+	assert.Equal(t, 303, rr.Code)
+}
+
+func TestServicesHandler2(t *testing.T) {
+	req, err := http.NewRequest("GET", "/services", nil)
+	assert.Nil(t, err)
+	rr := httptest.NewRecorder()
+	Router().ServeHTTP(rr, req)
+	body := rr.Body.String()
+	assert.Equal(t, 200, rr.Code)
+	assert.Contains(t, body, "<title>Statup | Services</title>")
+	assert.Contains(t, body, "Crystal Castles - Kept")
+	assert.Contains(t, body, "Local Postgres")
+	assert.Contains(t, body, "Statup  made with ❤️")
+}
+
+func TestViewHTTPServicesHandler(t *testing.T) {
+	req, err := http.NewRequest("GET", "/service/6", nil)
+	assert.Nil(t, err)
+	rr := httptest.NewRecorder()
+	Router().ServeHTTP(rr, req)
+	body := rr.Body.String()
+	assert.Equal(t, 200, rr.Code)
+	t.Log(body)
+	assert.Contains(t, body, "<title>Statup | Crystal Castles - Kept Service</title>")
+	assert.Contains(t, body, "Statup  made with ❤️")
+}
+
+func TestViewTCPServicesHandler(t *testing.T) {
+	req, err := http.NewRequest("GET", "/service/7", nil)
+	assert.Nil(t, err)
+	rr := httptest.NewRecorder()
+	Router().ServeHTTP(rr, req)
+	body := rr.Body.String()
+	assert.Equal(t, 200, rr.Code)
+	t.Log(body)
+	assert.Contains(t, body, "<title>Statup | Local Postgres Service</title>")
+	assert.Contains(t, body, "Statup  made with ❤️")
+}
+
+func TestServicesUpdateHandler(t *testing.T) {
+	form := url.Values{}
+	form.Add("name", "The Bravery - An Honest Mistake")
+	form.Add("domain", "https://www.youtube.com/watch?v=O8vzbezVru4")
+	form.Add("method", "GET")
+	form.Add("expected_status", "")
+	form.Add("interval", "30")
+	form.Add("port", "")
+	form.Add("timeout", "15")
+	form.Add("check_type", "http")
+	form.Add("post_data", "")
+	req, err := http.NewRequest("POST", "/service/6", strings.NewReader(form.Encode()))
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	assert.Nil(t, err)
+	rr := httptest.NewRecorder()
+	Router().ServeHTTP(rr, req)
+	body := rr.Body.String()
+	assert.Equal(t, 200, rr.Code)
+	assert.Contains(t, body, "<title>Statup | The Bravery - An Honest Mistake Service</title>")
+	assert.Contains(t, body, "Statup  made with ❤️")
+}
+
+func TestLogsHandler(t *testing.T) {
+	req, err := http.NewRequest("GET", "/logs", nil)
+	assert.Nil(t, err)
+	rr := httptest.NewRecorder()
+	Router().ServeHTTP(rr, req)
+	body := rr.Body.String()
+	assert.Equal(t, 200, rr.Code)
+	assert.Contains(t, body, "<title>Statup | Logs</title>")
+	assert.Contains(t, body, "Statup  made with ❤️")
+}
+
+func TestLogsLineHandler(t *testing.T) {
+	req, err := http.NewRequest("GET", "/logs/line", nil)
+	assert.Nil(t, err)
+	rr := httptest.NewRecorder()
+	Router().ServeHTTP(rr, req)
+	body := rr.Body.String()
+	assert.Equal(t, 200, rr.Code)
+	t.Log(body)
+	assert.NotEmpty(t, body)
+}
+
+func TestSaveSettingsHandler(t *testing.T) {
+	form := url.Values{}
+	form.Add("project", "Awesome Status")
+	form.Add("description", "These tests can probably be better")
+	req, err := http.NewRequest("POST", "/settings", strings.NewReader(form.Encode()))
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	assert.Nil(t, err)
+	rr := httptest.NewRecorder()
+	Router().ServeHTTP(rr, req)
+	assert.Equal(t, 303, rr.Code)
+}
+
+func TestViewSettingsHandler(t *testing.T) {
+	req, err := http.NewRequest("GET", "/settings", nil)
+	assert.Nil(t, err)
+	rr := httptest.NewRecorder()
+	Router().ServeHTTP(rr, req)
+	body := rr.Body.String()
+	assert.Equal(t, 200, rr.Code)
+	assert.Contains(t, body, "<title>Statup | Settings</title>")
+	assert.Contains(t, body, "Awesome Status")
+	assert.Contains(t, body, "Statup  made with ❤️")
+}
diff --git a/handlers/setup.go b/handlers/setup.go
index 3903fd6c..3bfbe8f1 100644
--- a/handlers/setup.go
+++ b/handlers/setup.go
@@ -59,7 +59,7 @@ func ProcessSetupHandler(w http.ResponseWriter, r *http.Request) {
 	description := r.PostForm.Get("description")
 	domain := r.PostForm.Get("domain")
 	email := r.PostForm.Get("email")
-
+	
 	config := &core.DbConfig{
 		dbConn,
 		dbHost,