Merge "Adaptation of test env to helm chart"