Adjusting instance template.
Start adjusting the jenkins tests (wip).