Added more tests and refactored docker template to use text/template