Created test environment using docker
bug fixes to templates