diff --git a/provider/ecs/cluster_test.go b/provider/ecs/cluster_test.go
index 355dfa9fd..2ff4b850a 100644
--- a/provider/ecs/cluster_test.go
+++ b/provider/ecs/cluster_test.go
@@ -1,80 +1,144 @@
 package ecs
 
 import (
-	"reflect"
+	"github.com/stretchr/testify/assert"
 	"testing"
 )
 
 func TestClustersSet(t *testing.T) {
-	checkMap := map[string]Clusters{
-		"cluster":                    {"cluster"},
-		"cluster1,cluster2":          {"cluster1", "cluster2"},
-		"cluster1;cluster2":          {"cluster1", "cluster2"},
-		"cluster1,cluster2;cluster3": {"cluster1", "cluster2", "cluster3"},
+	tests := []struct {
+		desc     string
+		value    string
+		expected Clusters
+	}{
+		{
+			desc:     "One value should return Clusters of size 1",
+			value:    "cluster",
+			expected: Clusters{"cluster"},
+		},
+		{
+			desc:     "Two values separated by comma should return Clusters of size 2",
+			value:    "cluster1,cluster2",
+			expected: Clusters{"cluster1", "cluster2"},
+		},
+		{
+			desc:     "Two values separated by semicolon should return Clusters of size 2",
+			value:    "cluster1;cluster2",
+			expected: Clusters{"cluster1", "cluster2"},
+		},
+		{
+			desc:     "Three values separated by comma and semicolon should return Clusters of size 3",
+			value:    "cluster1,cluster2;cluster3",
+			expected: Clusters{"cluster1", "cluster2", "cluster3"},
+		},
 	}
-	for str, check := range checkMap {
-		var clusters Clusters
-		if err := clusters.Set(str); err != nil {
-			t.Fatalf("Error :%s", err)
-		}
-		if !reflect.DeepEqual(clusters, check) {
-			t.Fatalf("Expected:%s\ngot:%s", check, clusters)
-		}
+
+	for _, test := range tests {
+		test := test
+		t.Run(test.desc, func(t *testing.T) {
+			t.Parallel()
+			var clusters Clusters
+			err := clusters.Set(test.value)
+			assert.Nil(t, err)
+			assert.Equal(t, test.expected, clusters)
+		})
 	}
 }
 
 func TestClustersGet(t *testing.T) {
-	slices := []Clusters{
-		{"cluster"},
-		{"cluster1", "cluster2"},
-		{"cluster1", "cluster2", "cluster3"},
+	tests := []struct {
+		desc     string
+		clusters Clusters
+		expected Clusters
+	}{
+		{
+			desc:     "Should return 1 cluster",
+			clusters: Clusters{"cluster"},
+			expected: Clusters{"cluster"},
+		},
+		{
+			desc:     "Should return 2 clusters",
+			clusters: Clusters{"cluster1", "cluster2"},
+			expected: Clusters{"cluster1", "cluster2"},
+		},
+		{
+			desc:     "Should return 3 clusters",
+			clusters: Clusters{"cluster1", "cluster2", "cluster3"},
+			expected: Clusters{"cluster1", "cluster2", "cluster3"},
+		},
 	}
-	check := []Clusters{
-		{"cluster"},
-		{"cluster1", "cluster2"},
-		{"cluster1", "cluster2", "cluster3"},
-	}
-	for i, slice := range slices {
-		if !reflect.DeepEqual(slice.Get(), check[i]) {
-			t.Fatalf("Expected:%s\ngot:%s", check[i], slice)
-		}
+
+	for _, test := range tests {
+		test := test
+		t.Run(test.desc, func(t *testing.T) {
+			t.Parallel()
+			actual := test.clusters.Get()
+			assert.Equal(t, test.expected, actual)
+		})
 	}
 }
 
 func TestClustersString(t *testing.T) {
-	slices := []Clusters{
-		{"cluster"},
-		{"cluster1", "cluster2"},
-		{"cluster1", "cluster2", "cluster3"},
+	tests := []struct {
+		desc     string
+		clusters Clusters
+		expected string
+	}{
+		{
+			desc:     "Should return 1 cluster",
+			clusters: Clusters{"cluster"},
+			expected: "[cluster]",
+		},
+		{
+			desc:     "Should return 2 clusters",
+			clusters: Clusters{"cluster1", "cluster2"},
+			expected: "[cluster1 cluster2]",
+		},
+		{
+			desc:     "Should return 3 clusters",
+			clusters: Clusters{"cluster1", "cluster2", "cluster3"},
+			expected: "[cluster1 cluster2 cluster3]",
+		},
 	}
-	check := []string{
-		"[cluster]",
-		"[cluster1 cluster2]",
-		"[cluster1 cluster2 cluster3]",
-	}
-	for i, slice := range slices {
-		if !reflect.DeepEqual(slice.String(), check[i]) {
-			t.Fatalf("Expected:%s\ngot:%s", check[i], slice)
-		}
+	for _, test := range tests {
+		test := test
+		t.Run(test.desc, func(t *testing.T) {
+			t.Parallel()
+			actual := test.clusters.String()
+			assert.Equal(t, test.expected, actual)
+		})
 	}
 }
 
 func TestClustersSetValue(t *testing.T) {
-	check := []Clusters{
-		{"cluster"},
-		{"cluster1", "cluster2"},
-		{"cluster1", "cluster2", "cluster3"},
+	tests := []struct {
+		desc     string
+		clusters Clusters
+		expected Clusters
+	}{
+		{
+			desc:     "Should return Clusters of size 1",
+			clusters: Clusters{"cluster"},
+			expected: Clusters{"cluster"},
+		},
+		{
+			desc:     "Should return Clusters of size 2",
+			clusters: Clusters{"cluster1", "cluster2"},
+			expected: Clusters{"cluster1", "cluster2"},
+		},
+		{
+			desc:     "Should return Clusters of size 3",
+			clusters: Clusters{"cluster1", "cluster2", "cluster3"},
+			expected: Clusters{"cluster1", "cluster2", "cluster3"},
+		},
 	}
-	slices := []Clusters{
-		{"cluster"},
-		{"cluster1", "cluster2"},
-		{"cluster1", "cluster2", "cluster3"},
-	}
-	for i, s := range slices {
-		var slice Clusters
-		slice.SetValue(s)
-		if !reflect.DeepEqual(slice, check[i]) {
-			t.Fatalf("Expected:%s\ngot:%s", check[i], slice)
-		}
+	for _, test := range tests {
+		test := test
+		t.Run(test.desc, func(t *testing.T) {
+			t.Parallel()
+			var slice Clusters
+			slice.SetValue(test.clusters)
+			assert.Equal(t, test.expected, slice)
+		})
 	}
 }
diff --git a/provider/ecs/ecs.go b/provider/ecs/ecs.go
index b092ec8f9..64ea8efd9 100644
--- a/provider/ecs/ecs.go
+++ b/provider/ecs/ecs.go
@@ -409,7 +409,7 @@ func (p *Provider) lookupTaskDefinitions(ctx context.Context, client *awsClient,
 	return taskDefinitions, nil
 }
 
-func (i ecsInstance) label(k string) string {
+func (p *Provider) label(i ecsInstance, k string) string {
 	if v, found := i.containerDefinition.DockerLabels[k]; found {
 		return *v
 	}
@@ -439,7 +439,7 @@ func (p *Provider) filterInstance(i ecsInstance) bool {
 		return false
 	}
 
-	label := i.label(types.LabelEnable)
+	label := p.label(i, types.LabelEnable)
 	enabled := p.ExposedByDefault && label != "false" || label == "true"
 	if !enabled {
 		log.Debugf("Filtering disabled ecs instance %s (%s) (traefik.enabled = '%s')", i.Name, i.ID, label)
@@ -463,7 +463,7 @@ func (p *Provider) filterFrontends(instances []ecsInstance) []ecsInstance {
 }
 
 func (p *Provider) getFrontendRule(i ecsInstance) string {
-	if label := i.label(types.LabelFrontendRule); label != "" {
+	if label := p.label(i, types.LabelFrontendRule); label != "" {
 		return label
 	}
 	return "Host:" + strings.ToLower(strings.Replace(i.Name, "_", "-", -1)) + "." + p.Domain
@@ -471,7 +471,7 @@ func (p *Provider) getFrontendRule(i ecsInstance) string {
 
 func (p *Provider) getLoadBalancerSticky(instances []ecsInstance) string {
 	if len(instances) > 0 {
-		label := instances[0].label(types.LabelBackendLoadbalancerSticky)
+		label := p.label(instances[0], types.LabelBackendLoadbalancerSticky)
 		if label != "" {
 			return label
 		}
@@ -481,7 +481,7 @@ func (p *Provider) getLoadBalancerSticky(instances []ecsInstance) string {
 
 func (p *Provider) getLoadBalancerMethod(instances []ecsInstance) string {
 	if len(instances) > 0 {
-		label := instances[0].label(types.LabelBackendLoadbalancerMethod)
+		label := p.label(instances[0], types.LabelBackendLoadbalancerMethod)
 		if label != "" {
 			return label
 		}
@@ -505,44 +505,44 @@ func (p *Provider) chunkedTaskArns(tasks []*string) [][]*string {
 	return chunkedTasks
 }
 
-func (i ecsInstance) Protocol() string {
-	if label := i.label(types.LabelProtocol); label != "" {
+func (p *Provider) getProtocol(i ecsInstance) string {
+	if label := p.label(i, types.LabelProtocol); label != "" {
 		return label
 	}
 	return "http"
 }
 
-func (i ecsInstance) Host() string {
+func (p *Provider) getHost(i ecsInstance) string {
 	return *i.machine.PrivateIpAddress
 }
 
-func (i ecsInstance) Port() string {
+func (p *Provider) getPort(i ecsInstance) string {
 	return strconv.FormatInt(*i.container.NetworkBindings[0].HostPort, 10)
 }
 
-func (i ecsInstance) Weight() string {
-	if label := i.label(types.LabelWeight); label != "" {
+func (p *Provider) getWeight(i ecsInstance) string {
+	if label := p.label(i, types.LabelWeight); label != "" {
 		return label
 	}
 	return "0"
 }
 
-func (i ecsInstance) PassHostHeader() string {
-	if label := i.label(types.LabelFrontendPassHostHeader); label != "" {
+func (p *Provider) getPassHostHeader(i ecsInstance) string {
+	if label := p.label(i, types.LabelFrontendPassHostHeader); label != "" {
 		return label
 	}
 	return "true"
 }
 
-func (i ecsInstance) Priority() string {
-	if label := i.label(types.LabelFrontendPriority); label != "" {
+func (p *Provider) getPriority(i ecsInstance) string {
+	if label := p.label(i, types.LabelFrontendPriority); label != "" {
 		return label
 	}
 	return "0"
 }
 
-func (i ecsInstance) EntryPoints() []string {
-	if label := i.label(types.LabelFrontendEntryPoints); label != "" {
+func (p *Provider) getEntryPoints(i ecsInstance) []string {
+	if label := p.label(i, types.LabelFrontendEntryPoints); label != "" {
 		return strings.Split(label, ",")
 	}
 	return []string{}
diff --git a/provider/ecs/ecs_test.go b/provider/ecs/ecs_test.go
index 1264d3713..d540d5551 100644
--- a/provider/ecs/ecs_test.go
+++ b/provider/ecs/ecs_test.go
@@ -1,13 +1,13 @@
 package ecs
 
 import (
-	"reflect"
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/ecs"
 	"github.com/containous/traefik/types"
+	"github.com/stretchr/testify/assert"
 )
 
 func makeEcsInstance(containerDef *ecs.ContainerDefinition) ecsInstance {
@@ -58,171 +58,265 @@ func simpleEcsInstance(labels map[string]*string) ecsInstance {
 }
 
 func TestEcsProtocol(t *testing.T) {
-	cases := []struct {
+	tests := []struct {
+		desc         string
 		expected     string
 		instanceInfo ecsInstance
+		provider     *Provider
 	}{
 		{
+			desc:         "Protocol label is not set should return a string equals to http",
 			expected:     "http",
 			instanceInfo: simpleEcsInstance(map[string]*string{}),
+			provider:     &Provider{},
 		},
 		{
+			desc:     "Protocol label is set to http should return a string equals to http",
+			expected: "http",
+			instanceInfo: simpleEcsInstance(map[string]*string{
+				types.LabelProtocol: aws.String("http"),
+			}),
+			provider: &Provider{},
+		},
+		{
+			desc:     "Protocol label is set to https should return a string equals to https",
 			expected: "https",
 			instanceInfo: simpleEcsInstance(map[string]*string{
 				types.LabelProtocol: aws.String("https"),
 			}),
+			provider: &Provider{},
 		},
 	}
 
-	for i, c := range cases {
-		value := c.instanceInfo.Protocol()
-		if value != c.expected {
-			t.Fatalf("Should have been %v, got %v (case %d)", c.expected, value, i)
-		}
+	for _, test := range tests {
+		test := test
+		t.Run(test.desc, func(t *testing.T) {
+			t.Parallel()
+			actual := test.provider.getProtocol(test.instanceInfo)
+			assert.Equal(t, test.expected, actual)
+		})
 	}
 }
 
 func TestEcsHost(t *testing.T) {
-	cases := []struct {
+	tests := []struct {
+		desc         string
 		expected     string
 		instanceInfo ecsInstance
+		provider     *Provider
 	}{
 		{
+			desc:         "Default host should be 10.0.0.0",
 			expected:     "10.0.0.0",
 			instanceInfo: simpleEcsInstance(map[string]*string{}),
+			provider:     &Provider{},
 		},
 	}
 
-	for i, c := range cases {
-		value := c.instanceInfo.Host()
-		if value != c.expected {
-			t.Fatalf("Should have been %v, got %v (case %d)", c.expected, value, i)
-		}
+	for _, test := range tests {
+		test := test
+		t.Run(test.desc, func(t *testing.T) {
+			t.Parallel()
+			actual := test.provider.getHost(test.instanceInfo)
+			assert.Equal(t, test.expected, actual)
+		})
 	}
 }
 
 func TestEcsPort(t *testing.T) {
-	cases := []struct {
+	tests := []struct {
+		desc         string
 		expected     string
 		instanceInfo ecsInstance
+		provider     *Provider
 	}{
 		{
+			desc:         "Default port should be 80",
 			expected:     "80",
 			instanceInfo: simpleEcsInstance(map[string]*string{}),
+			provider:     &Provider{},
 		},
 	}
 
-	for i, c := range cases {
-		value := c.instanceInfo.Port()
-		if value != c.expected {
-			t.Fatalf("Should have been %v, got %v (case %d)", c.expected, value, i)
-		}
+	for _, test := range tests {
+		test := test
+		t.Run(test.desc, func(t *testing.T) {
+			t.Parallel()
+			actual := test.provider.getPort(test.instanceInfo)
+			assert.Equal(t, test.expected, actual)
+		})
 	}
 }
 
 func TestEcsWeight(t *testing.T) {
-	cases := []struct {
+	tests := []struct {
+		desc         string
 		expected     string
 		instanceInfo ecsInstance
+		provider     *Provider
 	}{
 		{
+			desc:         "Weight label not set should return a string equals to 0",
 			expected:     "0",
 			instanceInfo: simpleEcsInstance(map[string]*string{}),
+			provider:     &Provider{},
 		},
 		{
+			desc:     "Weight label set 0 should return a string equals to 0",
+			expected: "0",
+			instanceInfo: simpleEcsInstance(map[string]*string{
+				types.LabelWeight: aws.String("0"),
+			}),
+			provider: &Provider{},
+		},
+		{
+			desc:     "Weight label set -1 should return a string equals to -1",
+			expected: "-1",
+			instanceInfo: simpleEcsInstance(map[string]*string{
+				types.LabelWeight: aws.String("-1"),
+			}),
+			provider: &Provider{},
+		},
+		{
+			desc:     "Weight label set 10 should return a string equals to 10",
 			expected: "10",
 			instanceInfo: simpleEcsInstance(map[string]*string{
 				types.LabelWeight: aws.String("10"),
 			}),
+			provider: &Provider{},
 		},
 	}
 
-	for i, c := range cases {
-		value := c.instanceInfo.Weight()
-		if value != c.expected {
-			t.Fatalf("Should have been %v, got %v (case %d)", c.expected, value, i)
-		}
+	for _, test := range tests {
+		test := test
+		t.Run(test.desc, func(t *testing.T) {
+			t.Parallel()
+			actual := test.provider.getWeight(test.instanceInfo)
+			assert.Equal(t, test.expected, actual)
+		})
 	}
 }
 
 func TestEcsPassHostHeader(t *testing.T) {
-	cases := []struct {
+	tests := []struct {
+		desc         string
 		expected     string
 		instanceInfo ecsInstance
+		provider     *Provider
 	}{
 		{
+			desc:         "Frontend pass host header label not set should return a string equals to true",
 			expected:     "true",
 			instanceInfo: simpleEcsInstance(map[string]*string{}),
+			provider:     &Provider{},
 		},
 		{
+			desc:     "Frontend pass host header label set to false should return a string equals to false",
 			expected: "false",
 			instanceInfo: simpleEcsInstance(map[string]*string{
 				types.LabelFrontendPassHostHeader: aws.String("false"),
 			}),
+			provider: &Provider{},
+		},
+		{
+			desc:     "Frontend pass host header label set to true should return a string equals to true",
+			expected: "true",
+			instanceInfo: simpleEcsInstance(map[string]*string{
+				types.LabelFrontendPassHostHeader: aws.String("true"),
+			}),
+			provider: &Provider{},
 		},
 	}
 
-	for i, c := range cases {
-		value := c.instanceInfo.PassHostHeader()
-		if value != c.expected {
-			t.Fatalf("Should have been %v, got %v (case %d)", c.expected, value, i)
-		}
+	for _, test := range tests {
+		test := test
+		t.Run(test.desc, func(t *testing.T) {
+			t.Parallel()
+			actual := test.provider.getPassHostHeader(test.instanceInfo)
+			assert.Equal(t, test.expected, actual)
+		})
 	}
 }
 
 func TestEcsPriority(t *testing.T) {
-	cases := []struct {
+	tests := []struct {
+		desc         string
 		expected     string
 		instanceInfo ecsInstance
+		provider     *Provider
 	}{
 		{
+			desc:         "Frontend priority label not set should return a string equals to 0",
 			expected:     "0",
 			instanceInfo: simpleEcsInstance(map[string]*string{}),
+			provider:     &Provider{},
 		},
 		{
+			desc:     "Frontend priority label set to 10 should return a string equals to 10",
 			expected: "10",
 			instanceInfo: simpleEcsInstance(map[string]*string{
 				types.LabelFrontendPriority: aws.String("10"),
 			}),
+			provider: &Provider{},
+		},
+		{
+			desc:     "Frontend priority label set to -1 should return a string equals to -1",
+			expected: "-1",
+			instanceInfo: simpleEcsInstance(map[string]*string{
+				types.LabelFrontendPriority: aws.String("-1"),
+			}),
+			provider: &Provider{},
 		},
 	}
 
-	for i, c := range cases {
-		value := c.instanceInfo.Priority()
-		if value != c.expected {
-			t.Fatalf("Should have been %v, got %v (case %d)", c.expected, value, i)
-		}
+	for _, test := range tests {
+		test := test
+		t.Run(test.desc, func(t *testing.T) {
+			t.Parallel()
+			actual := test.provider.getPriority(test.instanceInfo)
+			assert.Equal(t, test.expected, actual)
+		})
 	}
 }
 
 func TestEcsEntryPoints(t *testing.T) {
-	cases := []struct {
+	tests := []struct {
+		desc         string
 		expected     []string
 		instanceInfo ecsInstance
+		provider     *Provider
 	}{
 		{
+			desc:         "Frontend entrypoints label not set should return empty array",
 			expected:     []string{},
 			instanceInfo: simpleEcsInstance(map[string]*string{}),
+			provider:     &Provider{},
 		},
 		{
+			desc:     "Frontend entrypoints label set to http should return a string array of 1 element",
 			expected: []string{"http"},
 			instanceInfo: simpleEcsInstance(map[string]*string{
 				types.LabelFrontendEntryPoints: aws.String("http"),
 			}),
+			provider: &Provider{},
 		},
 		{
+			desc:     "Frontend entrypoints label set to http,https should return a string array of 2 elements",
 			expected: []string{"http", "https"},
 			instanceInfo: simpleEcsInstance(map[string]*string{
 				types.LabelFrontendEntryPoints: aws.String("http,https"),
 			}),
+			provider: &Provider{},
 		},
 	}
 
-	for i, c := range cases {
-		value := c.instanceInfo.EntryPoints()
-		if !reflect.DeepEqual(value, c.expected) {
-			t.Fatalf("Should have been %v, got %v (case %d)", c.expected, value, i)
-		}
+	for _, test := range tests {
+		test := test
+		t.Run(test.desc, func(t *testing.T) {
+			t.Parallel()
+			actual := test.provider.getEntryPoints(test.instanceInfo)
+			assert.Equal(t, test.expected, actual)
+		})
 	}
 }
 
@@ -243,108 +337,187 @@ func TestFilterInstance(t *testing.T) {
 	invalidMachineState := simpleEcsInstance(map[string]*string{})
 	invalidMachineState.machine.State.Name = aws.String(ec2.InstanceStateNameStopped)
 
-	cases := []struct {
-		expected         bool
-		exposedByDefault bool
-		instanceInfo     ecsInstance
+	tests := []struct {
+		desc         string
+		expected     bool
+		instanceInfo ecsInstance
+		provider     *Provider
 	}{
 		{
-			expected:         true,
-			exposedByDefault: true,
-			instanceInfo:     simpleEcsInstance(map[string]*string{}),
+			desc:         "Instance without enable label and exposed by default enabled should be not filtered",
+			expected:     true,
+			instanceInfo: simpleEcsInstance(map[string]*string{}),
+			provider: &Provider{
+				ExposedByDefault: true,
+			},
 		},
 		{
-			expected:         false,
-			exposedByDefault: false,
-			instanceInfo:     simpleEcsInstance(map[string]*string{}),
+			desc:         "Instance without enable label and exposed by default disabled should be filtered",
+			expected:     false,
+			instanceInfo: simpleEcsInstance(map[string]*string{}),
+			provider: &Provider{
+				ExposedByDefault: false,
+			},
 		},
 		{
-			expected:         false,
-			exposedByDefault: true,
+			desc:     "Instance with enable label set to false and exposed by default enabled should be filtered",
+			expected: false,
 			instanceInfo: simpleEcsInstance(map[string]*string{
 				types.LabelEnable: aws.String("false"),
 			}),
+			provider: &Provider{
+				ExposedByDefault: true,
+			},
 		},
 		{
-			expected:         true,
-			exposedByDefault: false,
+			desc:     "Instance with enable label set to true and exposed by default disabled should be not filtered",
+			expected: true,
 			instanceInfo: simpleEcsInstance(map[string]*string{
 				types.LabelEnable: aws.String("true"),
 			}),
+			provider: &Provider{
+				ExposedByDefault: false,
+			},
 		},
 		{
-			expected:         false,
-			exposedByDefault: true,
-			instanceInfo:     nilPrivateIP,
+			desc:         "Instance with nil private ip and exposed by default enabled should be filtered",
+			expected:     false,
+			instanceInfo: nilPrivateIP,
+			provider: &Provider{
+				ExposedByDefault: true,
+			},
 		},
 		{
-			expected:         false,
-			exposedByDefault: true,
-			instanceInfo:     nilMachine,
+			desc:         "Instance with nil machine and exposed by default enabled should be filtered",
+			expected:     false,
+			instanceInfo: nilMachine,
+			provider: &Provider{
+				ExposedByDefault: true,
+			},
 		},
 		{
-			expected:         false,
-			exposedByDefault: true,
-			instanceInfo:     nilMachineState,
+			desc:         "Instance with nil machine state and exposed by default enabled should be filtered",
+			expected:     false,
+			instanceInfo: nilMachineState,
+			provider: &Provider{
+				ExposedByDefault: true,
+			},
 		},
 		{
-			expected:         false,
-			exposedByDefault: true,
-			instanceInfo:     nilMachineStateName,
+			desc:         "Instance with nil machine state name and exposed by default enabled should be filtered",
+			expected:     false,
+			instanceInfo: nilMachineStateName,
+			provider: &Provider{
+				ExposedByDefault: true,
+			},
 		},
 		{
-			expected:         false,
-			exposedByDefault: true,
-			instanceInfo:     invalidMachineState,
+			desc:         "Instance with invalid machine state and exposed by default enabled should be filtered",
+			expected:     false,
+			instanceInfo: invalidMachineState,
+			provider: &Provider{
+				ExposedByDefault: true,
+			},
 		},
 	}
 
-	for i, c := range cases {
-		provider := &Provider{
-			ExposedByDefault: c.exposedByDefault,
-		}
-		value := provider.filterInstance(c.instanceInfo)
-		if value != c.expected {
-			t.Fatalf("Should have been %v, got %v (case %d)", c.expected, value, i)
-		}
+	for _, test := range tests {
+		test := test
+		t.Run(test.desc, func(t *testing.T) {
+			t.Parallel()
+			actual := test.provider.filterInstance(test.instanceInfo)
+			assert.Equal(t, test.expected, actual)
+		})
 	}
 }
 
 func TestTaskChunking(t *testing.T) {
-	provider := &Provider{}
-
 	testval := "a"
-	cases := []struct {
+	tests := []struct {
+		desc            string
 		count           int
 		expectedLengths []int
+		provider        *Provider
 	}{
-		{0, []int(nil)},
-		{1, []int{1}},
-		{99, []int{99}},
-		{100, []int{100}},
-		{101, []int{100, 1}},
-		{199, []int{100, 99}},
-		{200, []int{100, 100}},
-		{201, []int{100, 100, 1}},
-		{555, []int{100, 100, 100, 100, 100, 55}},
-		{1001, []int{100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 1}},
+		{
+			desc:            "0 parameter should return nil",
+			count:           0,
+			expectedLengths: []int(nil),
+			provider:        &Provider{},
+		},
+		{
+			desc:            "1 parameter should return 1 array of 1 element",
+			count:           1,
+			expectedLengths: []int{1},
+			provider:        &Provider{},
+		},
+		{
+			desc:            "99 parameters should return 1 array of 99 elements",
+			count:           99,
+			expectedLengths: []int{99},
+			provider:        &Provider{},
+		},
+		{
+			desc:            "100 parameters should return 1 array of 100 elements",
+			count:           100,
+			expectedLengths: []int{100},
+			provider:        &Provider{},
+		},
+		{
+			desc:            "101 parameters should return 1 array of 100 elements and 1 array of 1 element",
+			count:           101,
+			expectedLengths: []int{100, 1},
+			provider:        &Provider{},
+		},
+		{
+			desc:            "199 parameters should return 1 array of 100 elements and 1 array of 99 elements",
+			count:           199,
+			expectedLengths: []int{100, 99},
+			provider:        &Provider{},
+		},
+		{
+			desc:            "200 parameters should return 2 arrays of 100 elements each",
+			count:           200,
+			expectedLengths: []int{100, 100},
+			provider:        &Provider{},
+		},
+		{
+			desc:            "201 parameters should return 2 arrays of 100 elements each and 1 array of 1 element",
+			count:           201,
+			expectedLengths: []int{100, 100, 1},
+			provider:        &Provider{},
+		},
+		{
+			desc:            "555 parameters should return 5 arrays of 100 elements each and 1 array of 55 elements",
+			count:           555,
+			expectedLengths: []int{100, 100, 100, 100, 100, 55},
+			provider:        &Provider{},
+		},
+		{
+			desc:            "1001 parameters should return 10 arrays of 100 elements each and 1 array of 1 element",
+			count:           1001,
+			expectedLengths: []int{100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 1},
+			provider:        &Provider{},
+		},
 	}
 
-	for _, c := range cases {
-		var tasks []*string
-		for v := 0; v < c.count; v++ {
-			tasks = append(tasks, &testval)
-		}
+	for _, test := range tests {
+		test := test
+		t.Run(test.desc, func(t *testing.T) {
+			var tasks []*string
+			for v := 0; v < test.count; v++ {
+				tasks = append(tasks, &testval)
+			}
 
-		out := provider.chunkedTaskArns(tasks)
-		var outCount []int
+			out := test.provider.chunkedTaskArns(tasks)
+			var outCount []int
 
-		for _, el := range out {
-			outCount = append(outCount, len(el))
-		}
+			for _, el := range out {
+				outCount = append(outCount, len(el))
+			}
+
+			assert.Equal(t, test.expectedLengths, outCount, "Chunking %d elements", test.count)
+		})
 
-		if !reflect.DeepEqual(outCount, c.expectedLengths) {
-			t.Errorf("Chunking %d elements, expected %#v, got %#v", c.count, c.expectedLengths, outCount)
-		}
 	}
 }
diff --git a/templates/ecs.tmpl b/templates/ecs.tmpl
index 99c758d24..9fbcd317e 100644
--- a/templates/ecs.tmpl
+++ b/templates/ecs.tmpl
@@ -5,8 +5,8 @@
 
   {{range $index, $i := $instances}}
     [backends.backend-{{ $i.Name }}.servers.server-{{ $i.Name }}{{ $i.ID }}]
-      url = "{{ $i.Protocol }}://{{ $i.Host }}:{{ $i.Port }}"
-      weight = {{ $i.Weight }}
+      url = "{{ getProtocol $i }}://{{ getHost $i }}:{{ getPort $i }}"
+      weight = {{ getWeight $i}}
   {{end}}
 {{end}}
 
@@ -14,9 +14,9 @@
   {{range filterFrontends $instances}}
     [frontends.frontend-{{ $serviceName }}]
       backend = "backend-{{ $serviceName }}"
-      passHostHeader = {{ .PassHostHeader }}
-      priority = {{ .Priority }}
-      entryPoints = [{{range  .EntryPoints }}
+      passHostHeader = {{ getPassHostHeader .}}
+      priority = {{ getPriority .}}
+      entryPoints = [{{range  getEntryPoints .}}
       "{{.}}",
     {{end}}]
     [frontends.frontend-{{ $serviceName }}.routes.route-frontend-{{ $serviceName }}]