diff --git a/t/000setup.t b/t/000setup.t
index 3c53ca3..6fdb5e8 100755
--- a/t/000setup.t
+++ b/t/000setup.t
@@ -1,14 +1,44 @@
 #!/bin/bash
 eval "$(curl -q -s https://raw.githubusercontent.com/coryb/osht/master/osht.sh)"
 cd $(dirname $0)
-jira=../jira
+jira="../jira --user admin"
 
-PLAN 4
+PLAN 13
 
+# clean out any old containers
 RUNS sh -c "docker rm -f go-jira-test || true"
 
+# start newt jira service
 RUNS docker run --detach --name go-jira-test --publish 8080:8080 go-jira-test:latest
 
+# wait a few seconds for it to bind to port 8080
 RUNS sleep 10
 
+# wait for healthchecks to pass, curl will retry 60 times over 1 min waiting
 RUNS curl -q -L --retry 60 --retry-delay 1 -f -s "http://localhost:8080/rest/api/2/serverInfo?doHealthCheck=1"
+
+# login to jira as admin user
+echo "admin123" | RUNS $jira login
+
+# create gojira user
+RUNS $jira req -M POST /rest/api/2/user '{"name":"gojira","password":"gojira123","emailAddress":"gojira@example.com","displayName":"Go Jira"}'
+
+# create SCRUM softwareproject
+RUNS $jira req -M POST /rest/api/2/project '{"key":"SCRUM","name":"Scrum","projectTypeKey":"software","projectTemplateKey":"com.pyxis.greenhopper.jira:gh-scrum-template","lead":"gojira"}'
+
+# create KANBAN software project
+RUNS $jira req -M POST /rest/api/2/project '{"key":"KANBAN","name":"Kanban","projectTypeKey":"software","projectTemplateKey":"com.pyxis.greenhopper.jira:gh-kanban-template","lead":"gojira"}'
+
+# create BAISC software project
+RUNS $jira req -M POST /rest/api/2/project '{"key":"BASIC","name":"Basic","projectTypeKey":"software","projectTemplateKey":"com.pyxis.greenhopper.jira:basic-software-development-template","lead":"gojira"}'
+
+# create PROJECT business project
+RUNS $jira req -M POST /rest/api/2/project '{"key":"PROJECT","name":"Project","projectTypeKey":"business","projectTemplateKey":"com.atlassian.jira-core-project-templates:jira-core-project-management","lead":"gojira"}'
+
+# create PROCESS business project
+RUNS $jira req -M POST /rest/api/2/project '{"key":"PROCESS","name":"Process","projectTypeKey":"business","projectTemplateKey":"com.atlassian.jira-core-project-templates:jira-core-process-management","lead":"gojira"}'
+
+# create TASK business project
+RUNS $jira req -M POST /rest/api/2/project '{"key":"TASK","name":"Task","projectTypeKey":"business","projectTemplateKey":"com.atlassian.jira-core-project-templates:jira-core-task-management","lead":"gojira"}'
+
+RUNS $jira logout
diff --git a/t/README.md b/t/README.md
index d6f734c..c361aa1 100644
--- a/t/README.md
+++ b/t/README.md
@@ -11,7 +11,7 @@ The test Jira was setup following the instructions [here](https://github.com/cpt
 
 ### build base docker image
 ```
-docker run --rm -i -v $(pwd):/root:ro coryb/dfpp Dockerfile.pre | docker build -t go-jira-base:latest - 
+docker run --rm -i -v $(pwd):/root:ro coryb/dfpp:1.0.2 Dockerfile.pre | docker build -t go-jira-base:latest - 
 ```
 
 ### Initialize container
@@ -25,29 +25,12 @@ open http://localhost:8080
 ```
 Then follow UI workflow to create "admin" user, skip intro and project creation.
 
-### Create gojira user
-```
-jira req --user admin -M POST /rest/api/2/user '{"name":"gojira","password":"gojira123","emailAddress":"gojira@example.com","displayName":"Go Jira"}'
-```
-
-### Initialize new projects
-```
-jira req --user admin -M POST /rest/api/2/project '{"key":"SCRUM","name":"Scrum","projectTypeKey":"software","projectTemplateKey":"com.pyxis.greenhopper.jira:gh-scrum-template","lead":"gojira"}'
-jira req --user admin -M POST /rest/api/2/project '{"key":"KANBAN","name":"Kanban","projectTypeKey":"software","projectTemplateKey":"com.pyxis.greenhopper.jira:gh-kanban-template","lead":"gojira"}'
-jira req --user admin -M POST /rest/api/2/project '{"key":"BASIC","name":"Basic","projectTypeKey":"software","projectTemplateKey":"com.pyxis.greenhopper.jira:basic-software-development-template","lead":"gojira"}'
-
-jira req --user admin -M POST /rest/api/2/project '{"key":"PROJECT","name":"Project","projectTypeKey":"business","projectTemplateKey":"com.atlassian.jira-core-project-templates:jira-core-project-management","lead":"gojira"}'
-jira req --user admin -M POST /rest/api/2/project '{"key":"PROCESS","name":"Process","projectTypeKey":"business","projectTemplateKey":"com.atlassian.jira-core-project-templates:jira-core-process-management","lead":"gojira"}'
-jira req --user admin -M POST /rest/api/2/project '{"key":"TASK","name":"Task","projectTypeKey":"business","projectTemplateKey":"com.atlassian.jira-core-project-templates:jira-core-task-management","lead":"gojira"}'
-```
-
 ### snapshot docker container
 ```
 docker commit go-jira-test go-jira-test:latest
 ```
 
 ### Destroy base container
-
 ```
 docker rm -f go-jira-test
 ```