diff --git a/extra/webapps/mason/backend/backend-docs.factor b/extra/webapps/mason/backend/backend-docs.factor
new file mode 100644
index 0000000000..547608ee3c
--- /dev/null
+++ b/extra/webapps/mason/backend/backend-docs.factor
@@ -0,0 +1,6 @@
+USING: help.markup help.syntax ;
+IN: webapps.mason.backend
+
+HELP: builder
+{ $class-description "The db table that keeps track of the build status of all build machines." }
+{ $see-also all-builders } ;
diff --git a/extra/webapps/mason/backend/backend-tests.factor b/extra/webapps/mason/backend/backend-tests.factor
index 9f4b09df4d..2dd10b82d0 100644
--- a/extra/webapps/mason/backend/backend-tests.factor
+++ b/extra/webapps/mason/backend/backend-tests.factor
@@ -1,5 +1,5 @@
-USING: continuations db io.directories io.files.temp tools.test
-webapps.mason.backend webapps.utils ;
+USING: accessors calendar continuations db io.directories
+io.files.temp kernel tools.test webapps.mason.backend webapps.utils ;
 IN: webapps.mason.backend.tests
 
 [ "mason-test.db" temp-file delete-file ] ignore-errors
@@ -17,3 +17,8 @@ IN: webapps.mason.backend.tests
         ] with-transaction
     ] with-db
 ] unit-test
+
+{ f f } [
+    builder new now >>heartbeat-timestamp
+    [ broken? ] [ crashed? ] bi
+] unit-test
diff --git a/extra/webapps/mason/dashboard/dashboard-tests.factor b/extra/webapps/mason/dashboard/dashboard-tests.factor
new file mode 100644
index 0000000000..f5320c2358
--- /dev/null
+++ b/extra/webapps/mason/dashboard/dashboard-tests.factor
@@ -0,0 +1,6 @@
+USING: tools.test xml.writer ;
+IN: webapps.mason.downloads
+
+{ "<p>No machines.</p>" } [
+    { } builder-list xml>string
+] unit-test
diff --git a/extra/webapps/mason/status-update/status-update-docs.factor b/extra/webapps/mason/status-update/status-update-docs.factor
new file mode 100644
index 0000000000..63a1f6295a
--- /dev/null
+++ b/extra/webapps/mason/status-update/status-update-docs.factor
@@ -0,0 +1,6 @@
+USING: furnace.actions help.markup help.syntax ;
+IN: webapps.mason.status-update
+
+HELP: <status-update-action>
+{ $values { "action" action } }
+{ $description "The mason server receives updates from the build machines on this url." } ;
diff --git a/extra/webapps/mason/status-update/status-update-tests.factor b/extra/webapps/mason/status-update/status-update-tests.factor
new file mode 100644
index 0000000000..c32a68f935
--- /dev/null
+++ b/extra/webapps/mason/status-update/status-update-tests.factor
@@ -0,0 +1,15 @@
+USING: db db.sqlite io.files.temp tools.test webapps.mason.backend
+webapps.mason.status-update ;
+IN: webapps.mason.status-update.tests
+
+! find-builder
+{
+    T{ builder { host-name "hej" } { os "os" } { cpu "cpu" } }
+} [
+    "mason-test.db" temp-file <sqlite-db> [
+        [
+            init-mason-db
+            "hej" "os" "cpu" find-builder
+        ] with-transaction
+    ] with-db
+] unit-test
diff --git a/extra/webapps/mason/utils/utils-tests.factor b/extra/webapps/mason/utils/utils-tests.factor
new file mode 100644
index 0000000000..3912720cb6
--- /dev/null
+++ b/extra/webapps/mason/utils/utils-tests.factor
@@ -0,0 +1,12 @@
+USING: accessors kernel namespaces present tools.test urls
+webapps.mason.backend webapps.mason.utils ;
+IN: webapps.mason.utils.tests
+
+
+{
+    "http://builds.factorcode.org/report?os=the-os&cpu=the-cpu"
+} [
+    URL" /" url set
+    builder new "the-os" >>os "the-cpu" >>cpu report-url
+    present
+] unit-test