Suggested code clean up
Merge branch 'docker-build' of https://github.com/jenky-hm/acceptance-test-harness