diff --git a/docs/content/development/_index.md b/docs/content/development/_index.md
index d130f8d..43d703b 100644
--- a/docs/content/development/_index.md
+++ b/docs/content/development/_index.md
@@ -1,7 +1,6 @@
 ---
 title: Development How-To's
 weight: 30
-draft: false
 
 ---
 
@@ -14,3 +13,4 @@ TOPICS:
 * Making new kinds of projects
 * Documentation (see above maintaining-drumk.it)
 * [Contributing to Drumkit](contribute)
+* [Testing](testing)
diff --git a/docs/content/development/mustache.md b/docs/content/development/mustache.md
index f93687e..19be22d 100644
--- a/docs/content/development/mustache.md
+++ b/docs/content/development/mustache.md
@@ -10,8 +10,9 @@ project codebases, etc.
 
 We are using the GoLang implementation of mustache because it is available as a
 self-contained binary for easy download.  To use it in a project, you need to have installed
-mustache by running `make mustache` first; in a Makefile, ensure you have listed it
-as a dependency so it gets installed before you try to use it, e.g.:
+mustache by running `make mustache` first. 
+
+If you are using for templating in a Makefile, list it as a dependency so it gets installed before you try to use it, e.g.:
 
 ```
 config.yml: mustache
diff --git a/docs/content/development/self-docs.md b/docs/content/development/self-docs.md
index 6d7be07..1eefd5f 100644
--- a/docs/content/development/self-docs.md
+++ b/docs/content/development/self-docs.md
@@ -4,7 +4,7 @@ weight: 50
 draft: true
 ---
 
-This text is coming from the docs folder inside the drumkit project.
+This text (what you are reading right now) is coming from the `docs` folder inside the drumkit project.
 
 However, Drumkit also has a self-documentation feature built in to provide command line assistance for the most common tasks.
 
diff --git a/docs/content/development/testing.md b/docs/content/development/testing.md
new file mode 100644
index 0000000..31981b9
--- /dev/null
+++ b/docs/content/development/testing.md
@@ -0,0 +1,18 @@
+---
+title: Drumkit Testing
+weight: 40
+---
+
+Drumkit is developed using a BDD approach with behat as the testing (suite?)
+
+The tests are located in the `.mk/features` directory.
+
+To run the tests locally, you need to install behat in the project.
+
+Navigate to the root directory of the project (the one above `.mk`) and run `make init-behat`
+
+You can test the installation by running `behat` (it just checks for correct installation of behat).
+
+To run the tests specific to the component you are developing, navigate to `.mk` and run `behat {filename}` for the component. For example, to run the tests for the hugo project, run `behat features/projects/hugo-docs.feature`
+
+These are the tests most likely to break and fail when you push a change, so they should be run locally before pushing to the repo. The CI process runs the complete behat suite on all branches, so this is the quickest way to prevent pipeline failures.
diff --git a/docs/content/usage/hugo-docs.md b/docs/content/usage/hugo-docs.md
index 8501f99..9c7e14f 100644
--- a/docs/content/usage/hugo-docs.md
+++ b/docs/content/usage/hugo-docs.md
@@ -33,4 +33,4 @@ The deployment to Gitlab Pages is managed automatically by the `.gitlab-ci.yml`
 
 At the bottom of the file, under `pages`, the `publish` stage will run `hugo` in the docs folder, which generates a set of static HTML files in the `public` folder, which is then made available through Gitlab pages.
 
-The default address at Gitlab Pages will be 
\ No newline at end of file
+The address at Gitlab Pages will be `http://<GITLAB_GROUP>.gitlab.io/<GITLAB_PROJECT_NAME>/`
\ No newline at end of file
diff --git a/mk/tasks/docs.mk b/mk/tasks/docs.mk
index 7927062..8db34b3 100644
--- a/mk/tasks/docs.mk
+++ b/mk/tasks/docs.mk
@@ -1,10 +1,10 @@
 # Build and serve our docs site locally.
 
-.PHONY: docs docs-kill
+.PHONY: docs-start docs-kill
 
 HUGO_SERVE_CMD=hugo serve --noHTTPCache --quiet --disableFastRender
 
-docs: ## Run Hugo server locally in the background (http://localhost:1313).
+docs-start: ## Run Hugo server locally in the background (http://localhost:1313).
 	cd docs && $(HUGO_SERVE_CMD) 2>&1 > /dev/null &
 
 #TODO add support to kill local server on a mac