diff --git a/servicefabric_test.go b/servicefabric_test.go
index 008ad51..9723e46 100644
--- a/servicefabric_test.go
+++ b/servicefabric_test.go
@@ -82,16 +82,26 @@ var instances = &sf.InstanceItemsPage{
 			},
 			ID: "131497042182378182",
 		},
+		{ //Include a failed service in test data
+			ReplicaItemBase: &sf.ReplicaItemBase{
+				Address:                      `{"Endpoints":{"":"http://anotheraddress:8081"}}`,
+				HealthState:                  "Error",
+				LastInBuildDurationInSeconds: "3",
+				NodeName:                     "_Node_0",
+				ReplicaStatus:                "Down", // status is currently down.
+				ServiceKind:                  "Stateless",
+			},
+			ID: "131497042182378183",
+		},
 	},
 }
 
 var labels = map[string]string{
-	label.SuffixEnable:            "true",
-	"frontend.rule.default":       "Path: /",
-	"backend.loadbalancer.method": "wrr",
-	"backend.circuitbreaker":      "NetworkErrorRatio() > 0.5",
+	label.SuffixEnable: "true",
 }
 
+// TestUpdateconfig - This test ensures the provider returns a configuration message to
+// the configuration channel when run.
 func TestUpdateConfig(t *testing.T) {
 
 	client := &clientMock{
@@ -102,38 +112,6 @@ func TestUpdateConfig(t *testing.T) {
 		instances:    instances,
 		labels:       labels,
 	}
-	expected := types.ConfigMessage{
-		ProviderName: "servicefabric",
-		Configuration: &types.Configuration{
-			Frontends: map[string]*types.Frontend{
-				"frontend-fabric:/TestApplication/TestService": {
-					EntryPoints: []string{},
-					Backend:     "fabric:/TestApplication/TestService",
-					Routes: map[string]types.Route{
-						"frontend.rule.default": {
-							Rule: "Path: /",
-						},
-					},
-				},
-			},
-			Backends: map[string]*types.Backend{
-				"fabric:/TestApplication/TestService": {
-					LoadBalancer: &types.LoadBalancer{
-						Method: "wrr",
-					},
-					CircuitBreaker: &types.CircuitBreaker{
-						Expression: "NetworkErrorRatio() > 0.5",
-					},
-					Servers: map[string]types.Server{
-						"131497042182378182": {
-							URL:    "http://localhost:8081",
-							Weight: 1,
-						},
-					},
-				},
-			},
-		},
-	}
 
 	provider := Provider{}
 	configurationChan := make(chan types.ConfigMessage)
@@ -153,18 +131,77 @@ func TestUpdateConfig(t *testing.T) {
 	}()
 
 	select {
-	case actual := <-configurationChan:
-		err := compareConfigurations(actual, expected)
-		if err != nil {
-			res, _ := json.Marshal(actual)
-			t.Log(string(res))
-			t.Error(err)
-		}
+	case <-configurationChan:
+		t.Log("Received configuration object")
 	case <-timeout:
 		t.Error("Provider failed to return configuration")
 	}
 }
 
+// TestServicesPresentInConfig tests that the basic services provide by SF
+// are return in the configuration object
+func TestServicesPresentInConfig(t *testing.T) {
+	provider := Provider{}
+	client := &clientMock{
+		applications: apps,
+		services:     services,
+		partitions:   partitions,
+		replicas:     nil,
+		instances:    instances,
+		labels:       labels,
+	}
+	config, err := provider.buildConfiguration(client)
+
+	if err != nil {
+		t.Error(err)
+	}
+
+	testCases := []struct {
+		desc  string
+		check func(types.Configuration) bool
+	}{
+		{
+			desc:  "Has 1 Frontend",
+			check: func(c types.Configuration) bool { return len(c.Frontends) == 1 },
+		},
+		{
+			desc:  "Has 1 backend",
+			check: func(c types.Configuration) bool { return len(c.Backends) == 1 },
+		},
+		{
+			desc: "Backend for 'fabric:/TestApplication/TestService' exists",
+			check: func(c types.Configuration) bool {
+				_, exists := config.Backends["fabric:/TestApplication/TestService"]
+				return exists
+			},
+		},
+		{
+			desc: "Backend has 1 server",
+			check: func(c types.Configuration) bool {
+				backend, _ := config.Backends["fabric:/TestApplication/TestService"]
+				return len(backend.Servers) == 1
+			},
+		},
+		{
+			desc: "Backend server has url 'http://localhost:8081'",
+			check: func(c types.Configuration) bool {
+				backend, _ := config.Backends["fabric:/TestApplication/TestService"]
+				return backend.Servers["131497042182378182"].URL == "http://localhost:8081"
+			},
+		},
+	}
+
+	for _, test := range testCases {
+		test := test
+		t.Run(test.desc, func(t *testing.T) {
+			t.Parallel()
+			if !test.check(*config) {
+				t.Errorf("Check failed: %v", getJSON(config))
+			}
+		})
+	}
+}
+
 func TestFrontendLabelConfig(t *testing.T) {
 	testCases := []struct {
 		desc     string
@@ -243,8 +280,7 @@ func TestFrontendLabelConfig(t *testing.T) {
 					t.Error("Frontend is nil")
 				}
 				if !test.validate(*frontend) {
-					frontendJSON, _ := getJSON(frontend)
-					t.Log(frontendJSON)
+					t.Log(getJSON(frontend))
 					t.Fail()
 				}
 			}
@@ -406,12 +442,12 @@ func TestGetReplicaDefaultEndpoint(t *testing.T) {
 	}
 }
 
-func getJSON(i interface{}) (string, error) {
+func getJSON(i interface{}) string {
 	jsonBytes, err := json.Marshal(i)
 	if err != nil {
-		return "", err
+		panic(err)
 	}
-	return string(jsonBytes), nil
+	return string(jsonBytes)
 }
 
 func compareConfigurations(actual, expected types.ConfigMessage) error {