diff --git a/GNUmakefile b/GNUmakefile
index cacb6c97..41fabe59 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -17,6 +17,10 @@ test: fmtcheck
 testacc: fmtcheck
 	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m
 
+testacccoverage: fmtcheck
+	-TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m -race -covermode=atomic -coverprofile=coverage.out
+	go tool cover -html=coverage.out
+
 vet:
 	@echo "go vet ."
 	@go vet $$(go list ./... | grep -v vendor/) ; if [ $$? -eq 1 ]; then \
diff --git a/mso/resource_mso_rest.go b/mso/resource_mso_rest.go
index 323b6b63..ca37792a 100644
--- a/mso/resource_mso_rest.go
+++ b/mso/resource_mso_rest.go
@@ -37,6 +37,17 @@ func resourceMSORest() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
+
+			"ignore_on_destroy": &schema.Schema{
+				Type:     schema.TypeBool,
+				Required: true,
+			},
+
+			"schema_id": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
 		}),
 	}
 }
@@ -93,22 +104,26 @@ func resourceMSORestUpdate(d *schema.ResourceData, m interface{}) error {
 }
 
 func resourceMSORestDelete(d *schema.ResourceData, m interface{}) error {
-	var method, path, payload string
-	path = d.Get("path").(string)
-	payload = d.Get("payload").(string)
-	if tempVar, ok := d.GetOk("method"); ok {
-		method = tempVar.(string)
-	} else {
-		method = "DELETE"
-	}
-	if !contains(HTTP_METHODS, method) {
-		return fmt.Errorf("Invalid method %s passed", method)
-	}
-	msoClient := m.(*client.Client)
-	_, err := MakeRestRequest(msoClient, path, method, payload)
+	var ignore_on_destroy = d.Get("ignore_on_destroy").(bool)
+	if ignore_on_destroy == false {
+		var method, path, payload string
+		path = d.Get("path").(string)
+		payload = d.Get("payload").(string)
+		if tempVar, ok := d.GetOk("method"); ok {
+			method = tempVar.(string)
+		} else {
+			method = "DELETE"
+		}
+		if !contains(HTTP_METHODS, method) {
+			return fmt.Errorf("Invalid method %s passed", method)
+		}
 
-	if err != nil {
-		return err
+		msoClient := m.(*client.Client)
+		_, err := MakeRestRequest(msoClient, path, method, payload)
+
+		if err != nil {
+			return err
+		}
 	}
 	d.SetId("")
 	return nil
diff --git a/mso/resource_mso_schema_site_anp_epg_selector.go b/mso/resource_mso_schema_site_anp_epg_selector.go
index e4b1eca8..5d1288df 100644
--- a/mso/resource_mso_schema_site_anp_epg_selector.go
+++ b/mso/resource_mso_schema_site_anp_epg_selector.go
@@ -104,18 +104,29 @@ func resourceMSOSchemaSiteAnpEpgSelector() *schema.Resource {
 	}
 }
 
+var importReadSchemaID, importReadSiteID, importReadTemplate, importReadANP, importReadEPG string
+
 func resourceSchemaSiteApnEpgSelectorImport(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
 	log.Printf("[DEBUG] %s: Beginning Import", d.Id())
 	found := false
 	msoClient := m.(*client.Client)
-	get_attribute := strings.Split(d.Id(), "/")
-	schemaID := get_attribute[0]
-	siteID := get_attribute[2]
-	template := get_attribute[4]
-	anpName := get_attribute[6]
-	epgName := get_attribute[8]
-	name := get_attribute[10]
-
+	var schemaID, siteID, template, anpName, epgName, name string
+	if !strings.Contains(d.Id(), "/") {
+		name = d.Id()
+		schemaID = importReadSchemaID
+		siteID = importReadSiteID
+		template = importReadTemplate
+		anpName = importReadANP
+		epgName = importReadEPG
+	} else {
+		get_attribute := strings.Split(d.Id(), "/")
+		schemaID = get_attribute[0]
+		siteID = get_attribute[2]
+		template = get_attribute[4]
+		anpName = get_attribute[6]
+		epgName = get_attribute[8]
+		name = get_attribute[10]
+	}
 	cont, err := msoClient.GetViaURL(fmt.Sprintf("api/v1/schemas/%s", schemaID))
 	if err != nil {
 		return nil, err
@@ -180,7 +191,7 @@ func resourceSchemaSiteApnEpgSelectorImport(d *schema.ResourceData, m interface{
 								currentName := models.StripQuotes(selectorCont.S("name").String())
 								if currentName == name {
 									found = true
-									d.SetId(name)
+									d.SetId(currentName)
 									d.Set("name", currentName)
 									exps := selectorCont.S("expressions").Data().([]interface{})
 
@@ -357,14 +368,17 @@ func resourceSchemaSiteApnEpgSelectorUpdate(d *schema.ResourceData, m interface{
 func resourceSchemaSiteApnEpgSelectorRead(d *schema.ResourceData, m interface{}) error {
 	found := false
 	msoClient := m.(*client.Client)
-
 	dn := d.Id()
 	schemaID := d.Get("schema_id").(string)
 	siteID := d.Get("site_id").(string)
 	template := d.Get("template_name").(string)
 	anpName := d.Get("anp_name").(string)
 	epgName := d.Get("epg_name").(string)
-
+	importReadSchemaID = schemaID
+	importReadSiteID = siteID
+	importReadTemplate = template
+	importReadANP = anpName
+	importReadEPG = epgName
 	cont, err := msoClient.GetViaURL(fmt.Sprintf("api/v1/schemas/%s", schemaID))
 	if err != nil {
 		return err
@@ -429,7 +443,6 @@ func resourceSchemaSiteApnEpgSelectorRead(d *schema.ResourceData, m interface{})
 								currentName := models.StripQuotes(selectorCont.S("name").String())
 								if currentName == dn {
 									found = true
-									d.SetId(dn)
 									d.Set("name", currentName)
 									exps := selectorCont.S("expressions").Data().([]interface{})
 
diff --git a/mso/resource_mso_schema_site_anp_epg_selector_test.go b/mso/resource_mso_schema_site_anp_epg_selector_test.go
index 5c2b075f..4a10dbfd 100644
--- a/mso/resource_mso_schema_site_anp_epg_selector_test.go
+++ b/mso/resource_mso_schema_site_anp_epg_selector_test.go
@@ -19,12 +19,18 @@ func TestAccMSOSchemaSiteAnpEpgSelector_Basic(t *testing.T) {
 		CheckDestroy: testAccCheckMSOSchemaSiteAnpEpgSelectorDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCheckMSOSiteAnpEpgSelectorConfig_basic("one"),
+				Config: testAccCheckMSOSiteAnpEpgSelectorConfig_basic("in"),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckMSOSchemaSiteAnpEpgSelectorExists("mso_schema_site_anp_epg_selector.selector1", &ss),
-					testAccCheckMSOSchemaSiteAnpEpgSelectorAttributes("one", &ss),
+					testAccCheckMSOSchemaSiteAnpEpgSelectorExists("mso_schema.schema1", "mso_schema_site_anp_epg_selector.selector1", &ss),
+					testAccCheckMSOSchemaSiteAnpEpgSelectorAttributes("in", &ss),
 				),
 			},
+
+			{
+				ResourceName:      "mso_schema_site_anp_epg_selector.selector1",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
@@ -38,54 +44,174 @@ func TestAccMSOSchemaSiteAnpEpgSelector_Update(t *testing.T) {
 		CheckDestroy: testAccCheckMSOSchemaSiteAnpEpgSelectorDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCheckMSOSiteAnpEpgSelectorConfig_basic("one"),
+				Config: testAccCheckMSOSiteAnpEpgSelectorConfig_basic("in"),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckMSOSchemaSiteAnpEpgSelectorExists("mso_schema_site_anp_epg_selector.selector1", &ss),
-					testAccCheckMSOSchemaSiteAnpEpgSelectorAttributes("one", &ss),
+					testAccCheckMSOSchemaSiteAnpEpgSelectorExists("mso_schema.schema1", "mso_schema_site_anp_epg_selector.selector1", &ss),
+					testAccCheckMSOSchemaSiteAnpEpgSelectorAttributes("in", &ss),
 				),
 			},
 			{
-				Config: testAccCheckMSOSiteAnpEpgSelectorConfig_basic("two"),
+				Config: testAccCheckMSOSiteAnpEpgSelectorConfig_basic("equals"),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckMSOSchemaSiteAnpEpgSelectorExists("mso_schema_site_anp_epg_selector.selector1", &ss),
-					testAccCheckMSOSchemaSiteAnpEpgSelectorAttributes("two", &ss),
+					testAccCheckMSOSchemaSiteAnpEpgSelectorExists("mso_schema.schema1", "mso_schema_site_anp_epg_selector.selector1", &ss),
+					testAccCheckMSOSchemaSiteAnpEpgSelectorAttributes("equals", &ss),
 				),
 			},
 		},
 	})
 }
 
-func testAccCheckMSOSiteAnpEpgSelectorConfig_basic(key string) string {
+func testAccCheckMSOSiteAnpEpgSelectorConfig_basic(operator string) string {
 	return fmt.Sprintf(`
+	resource "mso_schema" "schema1" {
+		name = "Schema2"
+		template_name = "Template1"
+		tenant_id = "5fb5fed8520000452a9e8911"
+	}
+	
+	resource "mso_rest" "azure_site" {
+		path = "api/v1/schemas/${mso_schema.schema1.id}"
+		method = "PATCH"
+		schema_id=mso_schema.schema1.id
+		ignore_on_destroy = true
+		payload = <<EOF
+		[{
+			"op": "add",
+			"path": "/templates/Template1/vrfs/-",
+			"value": {
+				"name": "VRF",
+				"displayName": "vz1",
+				"vrfs": [{
+					"vrfRef": {
+						"schemaId": "${mso_schema.schema1.id}",
+						"templateName": "Template1",
+						"vrfName": "VRF"
+	
+	
+					}
+				}]
+			}
+		},
+		{
+			"op": "add",
+			"path": "/sites/-",
+			"value": {
+				"siteId": "5fb680aa4e0000d0513660c2",
+				"templateName": "Template1",
+				"vrfs": [{
+					"vrfRef": {
+						"schemaId": "${mso_schema.schema1.id}",
+						"templateName": "Template1",
+						"vrfName": "VRF"
+					},
+					"regions": [{
+						"name": "westus",
+						"cidrs": [{
+							"ip": "10.101.210.0/24",
+							"primary": true,
+							"subnets": [{
+								"ip": "10.101.210.0/25",
+								"zone": "",
+								"name": ""
+							}, {
+								"ip": "10.101.210.128/25",
+								"zone": "",
+								"name": ""
+							}],
+							"associatedRegion": "westus"
+						}],
+						"isVpnGatewayRouter": false,
+						"isTGWAttachment": true,
+						"cloudRsCtxProfileToGatewayRouterP": {
+							"name": "default",
+							"tenantName": "Test"
+						},
+						"hubnetworkPeering": false
+					}]
+				}],
+				"intersiteL3outs": null
+			}
+		}
+	]
+		EOF
+	
+	}
+
+	resource "mso_schema_template_anp" "anp1" {
+		schema_id=mso_rest.azure_site.schema_id
+		template= "Template1"
+		name = "ANP"
+		display_name="ANP"
+		}
+	
+	resource "mso_schema_template_bd" "bd" {
+		schema_id              = mso_schema.schema1.id
+		template_name          = mso_schema_template_anp.anp1.template
+		name                   = "BD"
+		display_name           = "test"
+		vrf_name = "VRF"
+	}
+	
+	resource "mso_schema_template_anp_epg" "anp_epg" {
+		schema_id = mso_schema.schema1.id
+		template_name = mso_schema_template_anp.anp1.template
+		anp_name = "ANP"
+		name = "EPG"
+		bd_name = mso_schema_template_bd.bd.name
+		vrf_name = "VRF"
+		display_name = "mso_epg1"
+		}
+	
+	resource "mso_schema_site_anp" "anp1" {
+		schema_id = mso_schema.schema1.id
+		anp_name = mso_schema_template_anp_epg.anp_epg.anp_name
+		template_name = "Template1"
+		site_id = "5fb680aa4e0000d0513660c2"
+	
+		}
+	
+	resource "mso_schema_site_anp_epg" "site_anp_epg" {
+		schema_id = mso_schema.schema1.id
+		template_name = mso_schema_site_anp.anp1.template_name
+		site_id = "5fb680aa4e0000d0513660c2"
+		anp_name = "ANP"
+		epg_name = "EPG"
+	}
+	
 	resource "mso_schema_site_anp_epg_selector" "selector1" {
-		schema_id   = "5c4d5bb72700000401f80948"
-		site_id     = "5c7c95b25100008f01c1ee3c"
-		template_name    = "Template1"
+		schema_id   = mso_schema.schema1.id
+		site_id     = "5fb680aa4e0000d0513660c2"
+		template_name    = mso_schema_site_anp_epg.site_anp_epg.template_name
 		anp_name    = "ANP"
-		epg_name    = "DB"
-		name        = "test_check"
+		epg_name    = "EPG"
+		name        = "check11"
 		expressions {
-			key = "%s"
-			operator = "keyExist"
-			value = "32"
+			key         = "region"
+			operator    = "%s"
+			value       = "westus"
+			}
 		}
-	 }
-`, key)
+
+`, operator)
 }
 
-func testAccCheckMSOSchemaSiteAnpEpgSelectorExists(selectorName string, ss *SiteAnpEpgSelectorTest) resource.TestCheckFunc {
+func testAccCheckMSOSchemaSiteAnpEpgSelectorExists(schemaName, selectorName string, ss *SiteAnpEpgSelectorTest) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		client := testAccProvider.Meta().(*client.Client)
-		rs1, err1 := s.RootModule().Resources[selectorName]
+		rs1, err1 := s.RootModule().Resources[schemaName]
+		rs2, err1 := s.RootModule().Resources[selectorName]
 
 		if !err1 {
 			return fmt.Errorf("Selector %s not found", selectorName)
 		}
 		if rs1.Primary.ID == "" {
+			return fmt.Errorf("No Schema id was set")
+		}
+		if rs2.Primary.ID == "" {
 			return fmt.Errorf("No Selector id was set")
 		}
 
-		cont, err := client.GetViaURL(fmt.Sprintf("api/v1/schemas/5c4d5bb72700000401f80948"))
+		cont, err := client.GetViaURL(fmt.Sprintf("api/v1/schemas/" + rs1.Primary.ID))
 		if err != nil {
 			return err
 		}
@@ -106,7 +232,7 @@ func testAccCheckMSOSchemaSiteAnpEpgSelectorExists(selectorName string, ss *Site
 			currentSite := models.StripQuotes(siteCont.S("siteId").String())
 			currentTemp := models.StripQuotes(siteCont.S("templateName").String())
 
-			if currentTemp == "Template1" && currentSite == "5c7c95b25100008f01c1ee3c" {
+			if currentTemp == "Template1" && currentSite == "5fb680aa4e0000d0513660c2" {
 				anpCount, err := siteCont.ArrayCount("anps")
 				if err != nil {
 					return fmt.Errorf("No Anp found")
@@ -136,7 +262,7 @@ func testAccCheckMSOSchemaSiteAnpEpgSelectorExists(selectorName string, ss *Site
 							epgRef := models.StripQuotes(epgCont.S("epgRef").String())
 							tokensEpg := strings.Split(epgRef, "/")
 							currentEpgName := tokensEpg[len(tokensEpg)-1]
-							if currentEpgName == "DB" {
+							if currentEpgName == "EPG" {
 								selectorCount, err := epgCont.ArrayCount("selectors")
 								if err != nil {
 									return fmt.Errorf("No selectors found")
@@ -149,7 +275,7 @@ func testAccCheckMSOSchemaSiteAnpEpgSelectorExists(selectorName string, ss *Site
 									}
 
 									currentName := models.StripQuotes(selectorCont.S("name").String())
-									if currentName == "test_check" {
+									if currentName == "check11" {
 										found = true
 										tp.Name = currentName
 										exps := selectorCont.S("expressions").Data().([]interface{})
@@ -200,72 +326,78 @@ func testAccCheckMSOSchemaSiteAnpEpgSelectorExists(selectorName string, ss *Site
 func testAccCheckMSOSchemaSiteAnpEpgSelectorDestroy(s *terraform.State) error {
 	client := testAccProvider.Meta().(*client.Client)
 
+	rs1, err1 := s.RootModule().Resources["mso_schema.schema1"]
+
+	if !err1 {
+		return fmt.Errorf("Schema %s not found", "mso_schema.schema1")
+	}
+
+	schemaid := rs1.Primary.ID
 	for _, rs := range s.RootModule().Resources {
-		cont, err := client.GetViaURL(fmt.Sprintf("api/v1/schemas/5c4d5bb72700000401f80948"))
-		if rs.Type == "mso_schema_site_anp_epg_selector" {
+		if rs.Type == "mso_schema_site_anp_epg_selector.selector1" {
+			cont, err := client.GetViaURL(fmt.Sprintf("api/v1/schemas/%s", schemaid))
 			if err != nil {
 				return err
-			}
-		} else {
-			siteCount, err := cont.ArrayCount("sites")
-			if err != nil {
-				return fmt.Errorf("No Sites found")
-			}
-
-			for i := 0; i < siteCount; i++ {
-				siteCont, err := cont.ArrayElement(i, "sites")
+			} else {
+				siteCount, err := cont.ArrayCount("sites")
 				if err != nil {
-					return err
+					return fmt.Errorf("No Site found")
 				}
 
-				currentSite := models.StripQuotes(siteCont.S("siteId").String())
-				currentTemp := models.StripQuotes(siteCont.S("templateName").String())
-
-				if currentTemp == "Template1" && currentSite == "5c7c95b25100008f01c1ee3c" {
-					anpCount, err := siteCont.ArrayCount("anps")
+				for i := 0; i < siteCount; i++ {
+					siteCont, err := cont.ArrayElement(i, "sites")
 					if err != nil {
-						return fmt.Errorf("No Anp found")
+						return err
 					}
 
-					for j := 0; j < anpCount; j++ {
-						anpCont, err := siteCont.ArrayElement(j, "anps")
+					currentSite := models.StripQuotes(siteCont.S("siteId").String())
+					currentTemp := models.StripQuotes(siteCont.S("templateName").String())
+
+					if currentTemp == "Template1" && currentSite == "5fb680aa4e0000d0513660c2" {
+						anpCount, err := siteCont.ArrayCount("anps")
 						if err != nil {
-							return err
+							return fmt.Errorf("No Anp found")
 						}
 
-						anpRef := models.StripQuotes(anpCont.S("anpRef").String())
-						tokens := strings.Split(anpRef, "/")
-						currentAnpName := tokens[len(tokens)-1]
-						if currentAnpName == "ANP" {
-							epgCount, err := anpCont.ArrayCount("epgs")
+						for j := 0; j < anpCount; j++ {
+							anpCont, err := siteCont.ArrayElement(j, "anps")
 							if err != nil {
-								return fmt.Errorf("No Epg found")
+								return err
 							}
 
-							for k := 0; k < epgCount; k++ {
-								epgCont, err := anpCont.ArrayElement(k, "epgs")
+							anpRef := models.StripQuotes(anpCont.S("anpRef").String())
+							tokens := strings.Split(anpRef, "/")
+							currentAnpName := tokens[len(tokens)-1]
+							if currentAnpName == "ANP" {
+								epgCount, err := anpCont.ArrayCount("epgs")
 								if err != nil {
-									return err
+									return fmt.Errorf("No Epg found")
 								}
 
-								epgRef := models.StripQuotes(epgCont.S("epgRef").String())
-								tokensEpg := strings.Split(epgRef, "/")
-								currentEpgName := tokensEpg[len(tokensEpg)-1]
-								if currentEpgName == "DB" {
-									selectorCount, err := epgCont.ArrayCount("selectors")
+								for k := 0; k < epgCount; k++ {
+									epgCont, err := anpCont.ArrayElement(k, "epgs")
 									if err != nil {
-										return fmt.Errorf("No selectors found")
+										return err
 									}
 
-									for s := 0; s < selectorCount; s++ {
-										selectorCont, err := epgCont.ArrayElement(s, "selectors")
+									epgRef := models.StripQuotes(epgCont.S("epgRef").String())
+									tokensEpg := strings.Split(epgRef, "/")
+									currentEpgName := tokensEpg[len(tokensEpg)-1]
+									if currentEpgName == "EPG" {
+										selectorCount, err := epgCont.ArrayCount("selectors")
 										if err != nil {
-											return err
+											return fmt.Errorf("No selectors found")
 										}
 
-										currentName := models.StripQuotes(selectorCont.S("name").String())
-										if currentName == "test_check" {
-											return fmt.Errorf("Schema Site Anp Epg Selector still exist")
+										for s := 0; s < selectorCount; s++ {
+											selectorCont, err := epgCont.ArrayElement(s, "selectors")
+											if err != nil {
+												return err
+											}
+											currentName := models.StripQuotes(selectorCont.S("name").String())
+											if currentName == "check11" {
+												return fmt.Errorf("Schema Site Anp Epg Selector still exist")
+											}
 										}
 									}
 								}
@@ -280,11 +412,11 @@ func testAccCheckMSOSchemaSiteAnpEpgSelectorDestroy(s *terraform.State) error {
 	return nil
 }
 
-func testAccCheckMSOSchemaSiteAnpEpgSelectorAttributes(key string, ss *SiteAnpEpgSelectorTest) resource.TestCheckFunc {
+func testAccCheckMSOSchemaSiteAnpEpgSelectorAttributes(operator string, ss *SiteAnpEpgSelectorTest) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		val := ss.Expressions[0].(map[string]interface{})
-		if key != val["key"] {
-			return fmt.Errorf("Bad Site anp epg Selector key %v", val["key"])
+		if operator != val["operator"] {
+			return fmt.Errorf("Bad Site anp epg Selector operator %v", val["operator"])
 		}
 		return nil
 	}
diff --git a/mso/resource_mso_schema_template.go b/mso/resource_mso_schema_template.go
index 8c05eb24..55d01848 100644
--- a/mso/resource_mso_schema_template.go
+++ b/mso/resource_mso_schema_template.go
@@ -59,7 +59,6 @@ func resourceMSOSchemaTemplateImport(d *schema.ResourceData, m interface{}) ([]*
 	log.Printf("[DEBUG] %s: Beginning Import", d.Id())
 	get_attribute := strings.Split(d.Id(), "/")
 	msoClient := m.(*client.Client)
-	name := get_attribute[2]
 	schemaId := get_attribute[0]
 	cont, err := msoClient.GetViaURL(fmt.Sprintf("api/v1/schemas/%s", schemaId))
 	if err != nil {
@@ -69,6 +68,7 @@ func resourceMSOSchemaTemplateImport(d *schema.ResourceData, m interface{}) ([]*
 	data := cont.S("templates").Data().([]interface{})
 	var flag bool
 	var count int
+	name := get_attribute[2]
 	for _, info := range data {
 		val := info.(map[string]interface{})
 		if val["name"].(string) == name {
@@ -83,7 +83,7 @@ func resourceMSOSchemaTemplateImport(d *schema.ResourceData, m interface{}) ([]*
 	}
 
 	dataCon := cont.S("templates").Index(count)
-	d.SetId(models.StripQuotes(dataCon.S("name").String()))
+	d.SetId(name)
 	d.Set("name", models.StripQuotes(dataCon.S("name").String()))
 	d.Set("display_name", models.StripQuotes(dataCon.S("displayName").String()))
 	d.Set("tenant_id", models.StripQuotes(dataCon.S("tenantId").String()))
@@ -143,7 +143,7 @@ func resourceMSOSchemaTemplateRead(d *schema.ResourceData, m interface{}) error
 		apiTemplateDisplayName := models.StripQuotes(tempCont.S("displayName").String())
 
 		if apiTenantId == stateTenantId && apiTemplateName == stateTemplateName && apiTemplateDisplayName == stateTemplateDisplayName {
-			d.SetId(apiTemplateName)
+			d.SetId(schemaId + "/templates/" + apiTemplateName)
 			d.Set("tenant_id", apiTenantId)
 			d.Set("name", apiTemplateName)
 			d.Set("display_name", apiTemplateDisplayName)
diff --git a/mso/resource_mso_schema_template_anp.go b/mso/resource_mso_schema_template_anp.go
index ee9331f2..fa5cc329 100644
--- a/mso/resource_mso_schema_template_anp.go
+++ b/mso/resource_mso_schema_template_anp.go
@@ -239,7 +239,7 @@ func resourceMSOSchemaTemplateAnpRead(d *schema.ResourceData, m interface{}) err
 				log.Println("currentanpname", currentAnpName)
 				if currentAnpName == anpName {
 					log.Println("found correct anpname")
-					d.SetId(currentAnpName)
+					d.SetId(schemaId + "/templates/" + currentTemplateName + "/anps/" + currentAnpName)
 					d.Set("name", currentAnpName)
 					if anpCont.Exists("displayName") {
 						d.Set("display_name", models.StripQuotes(anpCont.S("displayName").String()))
diff --git a/mso/resource_mso_schema_template_anp_test.go b/mso/resource_mso_schema_template_anp_test.go
index de4b6719..8a683420 100644
--- a/mso/resource_mso_schema_template_anp_test.go
+++ b/mso/resource_mso_schema_template_anp_test.go
@@ -2,6 +2,8 @@ package mso
 
 import (
 	"fmt"
+	"log"
+	"regexp"
 	"testing"
 
 	"github.com/ciscoecosystem/mso-go-client/client"
@@ -10,7 +12,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccSchemaTemplateAnp_Basic(t *testing.T) {
+func TestAccMSOSchemaTemplateAnp_Create(t *testing.T) {
 	var s SchemaTemplateAnpTest
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -18,17 +20,77 @@ func TestAccSchemaTemplateAnp_Basic(t *testing.T) {
 		CheckDestroy: testAccCheckMsoSchemaTemplateAnpDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCheckMsoSchemaTemplateAnpConfig_basic("test1"),
+				Config: testAccCheckMsoSchemaTemplateAnpConfig_Create("test1"),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckMsoSchemaTemplateAnpExists("mso_schema.schema1", "mso_schema_template_anp.anp1", &s),
 					testAccCheckMsoSchemaTemplateAnpAttributes("test1", &s),
 				),
 			},
+			{
+				//Config:            testSchemaTemplateAnpConfig("anp123"),
+				ResourceName:      "mso_schema_template_anp.anp1",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
 
-func TestAccMsoSchemaTemplateAnp_Update(t *testing.T) {
+func TestAccMSOSchemaTemplateAnp_CreateError(t *testing.T) {
+	var s SchemaTemplateAnpTest
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckMsoSchemaTemplateAnpDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCheckMsoSchemaTemplateAnpConfig_CreateError("test1"),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckMsoSchemaTemplateAnpExists("mso_schema.schema1", "mso_schema_template_anp.anp1", &s),
+					testAccCheckMsoSchemaTemplateAnpAttributes("test1", &s),
+				),
+			},
+			{
+				//Config:            testSchemaTemplateAnpConfig("anp123"),
+				ResourceName:      "mso_schema_template_anp.anp1",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+func TestAccMSOSchemaTemplateAnp_Name(t *testing.T) {
+	resource.Test(t, resource.TestCase{
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config:      testViewConfigNameError("test"),
+				ExpectError: regexp.MustCompile("errors during apply: \"Resource Not Found: template with name Template5 not found in List(Template1)\"" + "{}"),
+			},
+		},
+	})
+}
+
+func testViewConfigNameError(name string) string {
+	return fmt.Sprintf(`
+
+	resource "mso_schema" "schema1" {
+		name = "Schema2"
+		template_name = "Template1"
+		tenant_id = "5fb5fed8520000452a9e8911"
+		
+	  }
+	  resource "mso_schema_template_anp" "anp1" {
+		schema_id=mso_schema.schema1.id
+		template= "Template5"
+		name = "anp123"
+		display_name="%s"
+	  }
+	`, name)
+}
+
+func TestAccMSOSchemaTemplateAnp_Update(t *testing.T) {
 	var s SchemaTemplateAnpTest
 
 	resource.Test(t, resource.TestCase{
@@ -37,14 +99,14 @@ func TestAccMsoSchemaTemplateAnp_Update(t *testing.T) {
 		CheckDestroy: testAccCheckMsoSchemaTemplateAnpDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCheckMsoSchemaTemplateAnpConfig_basic("test1"),
+				Config: testAccCheckMsoSchemaTemplateAnpConfig_CreateError("test1"),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckMsoSchemaTemplateAnpExists("mso_schema.schema1", "mso_schema_template_anp.anp1", &s),
 					testAccCheckMsoSchemaTemplateAnpAttributes("test1", &s),
 				),
 			},
 			{
-				Config: testAccCheckMsoSchemaTemplateAnpConfig_basic("test2"),
+				Config: testAccCheckMsoSchemaTemplateAnpConfig_CreateError("test2"),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckMsoSchemaTemplateAnpExists("mso_schema.schema1", "mso_schema_template_anp.anp1", &s),
 					testAccCheckMsoSchemaTemplateAnpAttributes("test2", &s),
@@ -54,18 +116,80 @@ func TestAccMsoSchemaTemplateAnp_Update(t *testing.T) {
 	})
 }
 
-func testAccCheckMsoSchemaTemplateAnpConfig_basic(name string) string {
+func TestAccMSOSchemaTemplateAnp_UpdateError(t *testing.T) {
+	var s SchemaTemplateAnpTest
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckMsoSchemaTemplateAnpDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCheckMsoSchemaTemplateAnpConfig_UpdateError("test1"),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckMsoSchemaTemplateAnpExists("mso_schema.schema1", "mso_schema_template_anp.anp1", &s),
+					testAccCheckMsoSchemaTemplateAnpAttributes("test1", &s),
+				),
+			},
+		},
+	})
+}
+
+func testAccCheckMsoSchemaTemplateAnpConfig_Create(name string) string {
+	return fmt.Sprintf(`
+
+	resource "mso_schema" "schema1" {
+		name = "Schema2"
+		template_name = "Template1"
+		tenant_id = "5fb5fed8520000452a9e8911"
+		
+	  }
+	  resource "mso_schema_template_anp" "anp1" {
+		schema_id=mso_schema.schema1.id
+		template= "Template1"
+		name = "anp123"
+		display_name="%s"
+	  }
+	`, name)
+}
+
+func testAccCheckMsoSchemaTemplateAnpConfig_CreateError(name string) string {
 	return fmt.Sprintf(`
 
 	resource "mso_schema" "schema1" {
-		name = "Shah200"
-		template_name = "template99"
-		tenant_id = "5ea7e44b2c00007ebb0a2781"
+		name = "Schema2"
+		template_name = "Template1"
+		tenant_id = "5fb5fed8520000452a9e8911"
 		
 	  }
+
 	  resource "mso_schema_template_anp" "anp1" {
-		schema_id="${mso_schema.schema1.id}"
-		template= "template99"
+		schema_id=mso_schema.schema1.id
+		template= "Template1"
+		name = "anp123"
+		display_name="%s"
+	  }
+	`, name)
+}
+
+func testAccCheckMsoSchemaTemplateAnpConfig_UpdateError(name string) string {
+	return fmt.Sprintf(`
+
+	resource "mso_schema" "schema1" {
+		name = "Schema2"
+		template_name = "Template1"
+		tenant_id = "5fb5fed8520000452a9e8911"
+		
+	  }
+	  resource "mso_schema_template_anp" "anp1" {
+		schema_id=mso_schema.schema1.id
+		template= "Template1"
+		name = "anp123"
+		display_name="test1"
+	  }
+	  resource "mso_schema_template_anp" "anp2" {
+		schema_id=mso_schema.schema1.id
+		template= "Template1"
 		name = "anp123"
 		display_name="%s"
 	  }
@@ -131,7 +255,7 @@ func testAccCheckMsoSchemaTemplateAnpExists(schemaName string, schemaTemplateAnp
 		}
 
 		stvc := &stvt
-
+		log.Printf(fmt.Sprint(stvt.DisplayName))
 		*stv = *stvc
 		return nil
 	}
diff --git a/mso/resource_mso_schema_template_bd_subnet.go b/mso/resource_mso_schema_template_bd_subnet.go
index 65c22429..9da6f371 100644
--- a/mso/resource_mso_schema_template_bd_subnet.go
+++ b/mso/resource_mso_schema_template_bd_subnet.go
@@ -86,7 +86,7 @@ func resourceMSOTemplateBDSubnetImport(d *schema.ResourceData, m interface{}) ([
 
 	msoClient := m.(*client.Client)
 	get_attribute := strings.Split(d.Id(), "/")
-	import_attribute := regexp.MustCompile("(.*)/ip/(.*)")
+	import_attribute := regexp.MustCompile("(.*)/subnet/(.*)")
 	import_split := import_attribute.FindStringSubmatch(d.Id())
 	schemaId := get_attribute[0]
 	cont, err := msoClient.GetViaURL(fmt.Sprintf("api/v1/schemas/%s", schemaId))
@@ -137,9 +137,7 @@ func resourceMSOTemplateBDSubnetImport(d *schema.ResourceData, m interface{}) ([
 							d.Set("schema_id", schemaId)
 							d.Set("template_name", apiTemplateSubnet)
 							d.Set("bd_name", apiBD)
-							ip := models.StripQuotes(dataCon.S("ip").String())
-							idSubnet := strings.Split(ip, "/")
-							d.SetId(idSubnet[0])
+							d.SetId(apiIP)
 							d.Set("ip", models.StripQuotes(dataCon.S("ip").String()))
 							d.Set("scope", models.StripQuotes(dataCon.S("scope").String()))
 							d.Set("description", models.StripQuotes(dataCon.S("description").String()))
@@ -275,8 +273,7 @@ func resourceMSOTemplateBDSubnetRead(d *schema.ResourceData, m interface{}) erro
 							d.Set("template_name", apiTemplate)
 							d.Set("bd_name", apiBD)
 							ip := models.StripQuotes(subnetsCont.S("ip").String())
-							idSubnet := strings.Split(ip, "/")
-							d.SetId(idSubnet[0])
+							d.SetId(schemaId + "/template/" + apiTemplate + "/bd/" + apiBD + "/subnet/" + ip)
 							d.Set("ip", models.StripQuotes(subnetsCont.S("ip").String()))
 							d.Set("scope", models.StripQuotes(subnetsCont.S("scope").String()))
 							d.Set("description", models.StripQuotes(subnetsCont.S("description").String()))
diff --git a/mso/resource_mso_schema_template_bd_subnet_test.go b/mso/resource_mso_schema_template_bd_subnet_test.go
index 519909d5..f603a896 100644
--- a/mso/resource_mso_schema_template_bd_subnet_test.go
+++ b/mso/resource_mso_schema_template_bd_subnet_test.go
@@ -20,10 +20,15 @@ func TestAccMSOSchemaTemplateBDSubnet_Basic(t *testing.T) {
 			{
 				Config: testAccCheckMSOTemplateBDSubnetConfig_basic(true),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckMSOSchemaTemplateBDSubnetExists("mso_schema_template_bd_subnet.subnet", &ss),
+					testAccCheckMSOSchemaTemplateBDSubnetExists("mso_schema.schema1", "mso_schema_template_bd_subnet.subnet", &ss),
 					testAccCheckMSOSchemaTemplateBDSubnetAttributes(true, &ss),
 				),
 			},
+			{
+				ResourceName:      "mso_schema_template_bd_subnet.subnet",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
@@ -39,14 +44,14 @@ func TestAccMSOSchemaTemplateBDSubnet_Update(t *testing.T) {
 			{
 				Config: testAccCheckMSOTemplateBDSubnetConfig_basic(true),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckMSOSchemaTemplateBDSubnetExists("mso_schema_template_bd_subnet.subnet", &ss),
+					testAccCheckMSOSchemaTemplateBDSubnetExists("mso_schema.schema1", "mso_schema_template_bd_subnet.subnet", &ss),
 					testAccCheckMSOSchemaTemplateBDSubnetAttributes(true, &ss),
 				),
 			},
 			{
 				Config: testAccCheckMSOTemplateBDSubnetConfig_basic(false),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckMSOSchemaTemplateBDSubnetExists("mso_schema_template_bd_subnet.subnet", &ss),
+					testAccCheckMSOSchemaTemplateBDSubnetExists("mso_schema.schema1", "mso_schema_template_bd_subnet.subnet", &ss),
 					testAccCheckMSOSchemaTemplateBDSubnetAttributes(false, &ss),
 				),
 			},
@@ -56,33 +61,65 @@ func TestAccMSOSchemaTemplateBDSubnet_Update(t *testing.T) {
 
 func testAccCheckMSOTemplateBDSubnetConfig_basic(shared bool) string {
 	return fmt.Sprintf(`
- resource "mso_schema_template_bd_subnet" "subnet" {
-  schema_id = "5d5dbf3f2e0000580553ccce"
-  template_name = "Template1"
-  bd_name = "bd1"
-  ip = "13.1.1.0/8"
-  scope = "private"
-  shared = %v
-  no_default_gateway = true
-  querier = true
 
-}
+	resource "mso_schema" "schema1" {
+		name          = "Schema2"
+		template_name = "Template1"
+		tenant_id     = "5fb5fed8520000452a9e8911"
+	  
+	  }
+
+	  resource "mso_schema_template_vrf" "vrf1" {
+		schema_id=mso_schema.schema1.id
+		template=mso_schema.schema1.template_name
+		name= "VRF"
+		display_name="vrf1"
+		layer3_multicast=true
+		vzany=false
+	  }
+
+	resource "mso_schema_template_bd" "bridge_domain" {
+		schema_id = mso_schema.schema1.id
+		template_name = "Template1"
+		name = "BD"
+		display_name = "bd1"
+		layer2_stretch = true
+		intersite_bum_traffic = true
+		vrf_name = mso_schema_template_vrf.vrf1.name
+	}
+	resource "mso_schema_template_bd_subnet" "subnet" {
+		schema_id = mso_schema.schema1.id
+		template_name = "Template1"
+		bd_name = mso_schema_template_bd.bridge_domain.name
+		ip = "13.1.1.0/8"
+		scope = "private"
+		shared = "%t"
+		no_default_gateway = true
+		querier = true
+	}
 `, shared)
 }
 
-func testAccCheckMSOSchemaTemplateBDSubnetExists(bdName string, ss *TemplateBDSubnet) resource.TestCheckFunc {
+func testAccCheckMSOSchemaTemplateBDSubnetExists(schemaName string, bdName string, ss *TemplateBDSubnet) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		client := testAccProvider.Meta().(*client.Client)
-		rs1, err1 := s.RootModule().Resources[bdName]
-
+		rs1, err1 := s.RootModule().Resources[schemaName]
+		rs2, err2 := s.RootModule().Resources[bdName]
+		if rs1.Primary.ID == "" {
+			return fmt.Errorf("No Schema id was set")
+		}
 		if !err1 {
+			return fmt.Errorf("Schema %s not found", schemaName)
+		}
+
+		if !err2 {
 			return fmt.Errorf("BD Subnet %s not found", bdName)
 		}
-		if rs1.Primary.ID == "" {
+		if rs2.Primary.ID == "" {
 			return fmt.Errorf("No Subnet id was set")
 		}
 
-		cont, err := client.GetViaURL("api/v1/schemas/5d5dbf3f2e0000580553ccce")
+		cont, err := client.GetViaURL("api/v1/schemas/" + rs1.Primary.ID)
 		if err != nil {
 			return err
 		}
@@ -110,7 +147,7 @@ func testAccCheckMSOSchemaTemplateBDSubnetExists(bdName string, ss *TemplateBDSu
 						return err
 					}
 					apiBD := models.StripQuotes(bdCont.S("name").String())
-					if apiBD == "bd1" {
+					if apiBD == "BD" {
 						bdsubnetCount, err := bdCont.ArrayCount("subnets")
 						if err != nil {
 							return fmt.Errorf("Unable to get BD subnet list")
@@ -152,11 +189,15 @@ func testAccCheckMSOSchemaTemplateBDSubnetExists(bdName string, ss *TemplateBDSu
 
 func testAccCheckMSOSchemaTemplateBDSubnetDestroy(s *terraform.State) error {
 	client := testAccProvider.Meta().(*client.Client)
+	rs1, err1 := s.RootModule().Resources["mso_schema.schema1"]
+	if !err1 {
+		return fmt.Errorf("Schema %s not found", "mso_schema.schema1")
+	}
 
 	for _, rs := range s.RootModule().Resources {
 
 		if rs.Type == "mso_schema_template_bd_subnet" {
-			cont, err := client.GetViaURL("api/v1/schemas/5d5dbf3f2e0000580553ccce")
+			cont, err := client.GetViaURL("api/v1/schemas/" + rs1.Primary.ID)
 			if err != nil {
 				return nil
 			} else {
@@ -183,7 +224,7 @@ func testAccCheckMSOSchemaTemplateBDSubnetDestroy(s *terraform.State) error {
 								return err
 							}
 							apiBD := models.StripQuotes(bdCont.S("name").String())
-							if apiBD == "bd1" {
+							if apiBD == "BD" {
 								bdsubnetCount, err := bdCont.ArrayCount("subnets")
 								if err != nil {
 									return fmt.Errorf("Unable to get BD subnet list")
diff --git a/mso/resource_mso_schema_template_filter_entry.go b/mso/resource_mso_schema_template_filter_entry.go
index 67bef5a5..854f957a 100644
--- a/mso/resource_mso_schema_template_filter_entry.go
+++ b/mso/resource_mso_schema_template_filter_entry.go
@@ -175,7 +175,7 @@ func resourceMSOSchemaTemplateFilterEntryImport(d *schema.ResourceData, m interf
 							d.SetId(apiFilterEntry)
 							d.Set("entry_name", apiFilterEntry)
 							d.Set("entry_display_name", models.StripQuotes(entriesCont.S("displayName").String()))
-							if entriesCont.Exists("descirption") {
+							if entriesCont.Exists("description") {
 								d.Set("entry_description", models.StripQuotes(entriesCont.S("description").String()))
 							}
 							if entriesCont.Exists("etherType") {
@@ -421,7 +421,7 @@ func resourceMSOSchemaTemplateFilterEntryRead(d *schema.ResourceData, m interfac
 						}
 						apiFilterEntry := models.StripQuotes(entriesCont.S("name").String())
 						if apiFilterEntry == stateFilterEntry {
-							d.SetId(apiFilterEntry)
+							d.SetId(schemaId + "/template/" + apiTemplate + "/filter/" + apiFilter + "/filterEntry/" + apiFilterEntry)
 							d.Set("entry_name", apiFilterEntry)
 							d.Set("entry_display_name", models.StripQuotes(entriesCont.S("displayName").String()))
 							if entriesCont.Exists("descirption") {
diff --git a/mso/resource_mso_schema_template_filter_entry_test.go b/mso/resource_mso_schema_template_filter_entry_test.go
index 979de059..d7d17cd1 100644
--- a/mso/resource_mso_schema_template_filter_entry_test.go
+++ b/mso/resource_mso_schema_template_filter_entry_test.go
@@ -20,10 +20,15 @@ func TestAccMSOSchemaTemplateFilterEntry_Basic(t *testing.T) {
 			{
 				Config: testAccCheckMSOTemplateFilterEntryConfig_basic("unspecified"),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckMSOSchemaTemplateFilterEntryExists("mso_schema_template_filter_entry.filter_entry", &ss),
+					testAccCheckMSOSchemaTemplateFilterEntryExists("mso_schema.schema1", "mso_schema_template_filter_entry.filter_entry", &ss),
 					testAccCheckMSOSchemaTemplateFilterEntryAttributes("unspecified", &ss),
 				),
 			},
+			{
+				ResourceName:      "mso_schema_template_filter_entry.filter_entry",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
@@ -39,14 +44,14 @@ func TestAccMSOSchemaTemplateFilterEntry_Update(t *testing.T) {
 			{
 				Config: testAccCheckMSOTemplateFilterEntryConfig_basic("unspecified"),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckMSOSchemaTemplateFilterEntryExists("mso_schema_template_filter_entry.filter_entry", &ss),
+					testAccCheckMSOSchemaTemplateFilterEntryExists("mso_schema.schema1", "mso_schema_template_filter_entry.filter_entry", &ss),
 					testAccCheckMSOSchemaTemplateFilterEntryAttributes("unspecified", &ss),
 				),
 			},
 			{
 				Config: testAccCheckMSOTemplateFilterEntryConfig_basic("trill"),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckMSOSchemaTemplateFilterEntryExists("mso_schema_template_filter_entry.filter_entry", &ss),
+					testAccCheckMSOSchemaTemplateFilterEntryExists("mso_schema.schema1", "mso_schema_template_filter_entry.filter_entry", &ss),
 					testAccCheckMSOSchemaTemplateFilterEntryAttributes("trill", &ss),
 				),
 			},
@@ -56,42 +61,100 @@ func TestAccMSOSchemaTemplateFilterEntry_Update(t *testing.T) {
 
 func testAccCheckMSOTemplateFilterEntryConfig_basic(ethertype string) string {
 	return fmt.Sprintf(`
+
+	resource "mso_schema" "schema1" {
+		name          = "Schema2"
+		template_name = "Template1"
+		tenant_id     = "5fb5fed8520000452a9e8911"
+	  
+	  }
+
 	resource "mso_schema_template_filter_entry" "filter_entry" {
-		schema_id = "5c6c16d7270000c710f8094d"
+		schema_id = mso_schema.schema1.id
 		template_name = "Template1"
 		name = "Any"
 		display_name="Any"
 		entry_name = "testAcc"
 		entry_display_name="testAcc"
+		entry_description="test1"
 		destination_from="unspecified"
 		destination_to="unspecified"
 		source_from="unspecified"
 		source_to="unspecified"
 		arp_flag="unspecified"
 		ip_protocol="unspecified"
+		match_only_fragments=false
 		tcp_session_rules=[
 			"unspecified"
 		]
-		
+		 
+	}
 
+	resource "mso_schema_template_filter_entry" "filter_entry2" {
+		schema_id = mso_schema.schema1.id
+		template_name = mso_schema_template_filter_entry.filter_entry.template_name
+		name = "One"
+		display_name="One"
+		entry_name = "testAcc2"
+		entry_display_name="testAcc2"
+		entry_description="test2"
+		destination_from="unspecified"
+		destination_to="unspecified"
+		source_from="unspecified"
+		source_to="unspecified"
+		arp_flag="unspecified"
+		ip_protocol="unspecified"
+		match_only_fragments=false
+		ether_type="unspecified"
+		tcp_session_rules=[
+			"unspecified"
+		]
 		 
 	}
-`)
+
+	resource "mso_schema_template_filter_entry" "filter_entry3" {
+		schema_id = mso_schema.schema1.id
+		template_name = mso_schema_template_filter_entry.filter_entry2.template_name
+		name = "One"
+		display_name="One"
+		entry_name = "testAcc2"
+		entry_display_name="testAcc2"
+		entry_description="test2"
+		destination_from="unspecified"
+		destination_to="unspecified"
+		source_from="unspecified"
+		source_to="unspecified"
+		arp_flag="unspecified"
+		ip_protocol="unspecified"
+		match_only_fragments=false
+		ether_type="%s"
+		tcp_session_rules=[
+			"unspecified"
+		]
+		 
+	}
+`, ethertype)
 }
 
-func testAccCheckMSOSchemaTemplateFilterEntryExists(bdName string, ss *TemplateFilterEntry) resource.TestCheckFunc {
+func testAccCheckMSOSchemaTemplateFilterEntryExists(schemaName string, filterName string, ss *TemplateFilterEntry) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		client := testAccProvider.Meta().(*client.Client)
-		rs1, err1 := s.RootModule().Resources[bdName]
-
+		rs1, err1 := s.RootModule().Resources[schemaName]
+		rs2, err2 := s.RootModule().Resources[filterName]
 		if !err1 {
-			return fmt.Errorf("Entry %s not found", bdName)
+			return fmt.Errorf("Schema %s not found", schemaName)
+		}
+		if !err2 {
+			return fmt.Errorf("Entry %s not found", filterName)
 		}
 		if rs1.Primary.ID == "" {
 			return fmt.Errorf("No Schema id was set")
 		}
+		if rs2.Primary.ID == "" {
+			return fmt.Errorf("No Filter was set")
+		}
 
-		cont, err := client.GetViaURL("api/v1/schemas/5c6c16d7270000c710f8094d")
+		cont, err := client.GetViaURL("api/v1/schemas/" + rs1.Primary.ID)
 		if err != nil {
 			return err
 		}
@@ -159,11 +222,14 @@ func testAccCheckMSOSchemaTemplateFilterEntryExists(bdName string, ss *TemplateF
 
 func testAccCheckMSOSchemaTemplateFilterEntryDestroy(s *terraform.State) error {
 	client := testAccProvider.Meta().(*client.Client)
-
+	rs1, err1 := s.RootModule().Resources["mso_schema.schema1"]
+	if !err1 {
+		return fmt.Errorf("Schema %s not found", "mso_schema.schema1")
+	}
 	for _, rs := range s.RootModule().Resources {
 
 		if rs.Type == "mso_schema_template_filter_entry" {
-			cont, err := client.GetViaURL("api/v1/schemas/5c6c16d7270000c710f8094d")
+			cont, err := client.GetViaURL("api/v1/schemas/" + rs1.Primary.ID)
 			if err != nil {
 				return nil
 			} else {
diff --git a/mso/resource_mso_schema_template_l3out.go b/mso/resource_mso_schema_template_l3out.go
index acd8083c..8629518b 100644
--- a/mso/resource_mso_schema_template_l3out.go
+++ b/mso/resource_mso_schema_template_l3out.go
@@ -209,7 +209,7 @@ func resourceMSOTemplateL3outRead(d *schema.ResourceData, m interface{}) error {
 				}
 				apiL3out := models.StripQuotes(l3outCont.S("name").String())
 				if apiL3out == stateL3out {
-					d.SetId(apiL3out)
+					d.SetId(schemaId + "/template/" + apiTemplate + "/l3out/" + apiL3out)
 					d.Set("l3out_name", apiL3out)
 					d.Set("schema_id", schemaId)
 					d.Set("template_name", apiTemplate)
diff --git a/mso/resource_mso_schema_template_l3out_test.go b/mso/resource_mso_schema_template_l3out_test.go
index 7c7eb43a..d87756ed 100644
--- a/mso/resource_mso_schema_template_l3out_test.go
+++ b/mso/resource_mso_schema_template_l3out_test.go
@@ -19,12 +19,17 @@ func TestAccMSOSchemaTemplateL3out_Basic(t *testing.T) {
 		CheckDestroy: testAccCheckMSOSchemaTemplateL3outDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCheckMSOTemplateL3outConfig_basic("WoS_Cloud_VRF2"),
+				Config: testAccCheckMSOTemplateL3outConfig_basic("VRF"),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckMSOSchemaTemplateL3outExists("mso_schema_template_l3out.template_l3out", &ss),
-					testAccCheckMSOSchemaTemplateL3outAttributes("WoS_Cloud_VRF2", &ss),
+					testAccCheckMSOSchemaTemplateL3outExists("mso_schema.schema1", "mso_schema_template_l3out.template_l3out", &ss),
+					testAccCheckMSOSchemaTemplateL3outAttributes("VRF", &ss),
 				),
 			},
+			{
+				ResourceName:      "mso_schema_template_l3out.template_l3out",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
@@ -38,17 +43,17 @@ func TestAccMSOSchemaTemplateL3out_Update(t *testing.T) {
 		CheckDestroy: testAccCheckMSOSchemaTemplateL3outDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCheckMSOTemplateL3outConfig_basic("WoS_Cloud_VRF2"),
+				Config: testAccCheckMSOTemplateL3outConfig_basic("VRF"),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckMSOSchemaTemplateL3outExists("mso_schema_template_l3out.template_l3out", &ss),
-					testAccCheckMSOSchemaTemplateL3outAttributes("WoS_Cloud_VRF2", &ss),
+					testAccCheckMSOSchemaTemplateL3outExists("mso_schema.schema1", "mso_schema_template_l3out.template_l3out", &ss),
+					testAccCheckMSOSchemaTemplateL3outAttributes("VRF", &ss),
 				),
 			},
 			{
-				Config: testAccCheckMSOTemplateL3outConfig_basic("vrf589"),
+				Config: testAccCheckMSOTemplateL3outConfig_basic("VRF2"),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckMSOSchemaTemplateL3outExists("mso_schema_template_l3out.template_l3out", &ss),
-					testAccCheckMSOSchemaTemplateL3outAttributes("vrf589", &ss),
+					testAccCheckMSOSchemaTemplateL3outExists("mso_schema.schema1", "mso_schema_template_l3out.template_l3out", &ss),
+					testAccCheckMSOSchemaTemplateL3outAttributes("VRF2", &ss),
 				),
 			},
 		},
@@ -57,29 +62,59 @@ func TestAccMSOSchemaTemplateL3out_Update(t *testing.T) {
 
 func testAccCheckMSOTemplateL3outConfig_basic(name string) string {
 	return fmt.Sprintf(`
-	resource "mso_schema_template_l3out" "template_l3out" {
-		schema_id = "5c6c16d7270000c710f8094d"
+	resource "mso_schema" "schema1" {
+		name          = "Schema2"
 		template_name = "Template1"
+		tenant_id     = "5fb5fed8520000452a9e8911"
+	  
+	  }
+
+	  resource "mso_schema_template_vrf" "vrf1" {
+		schema_id=mso_schema.schema1.id
+		template=mso_schema.schema1.template_name
+		name= "VRF"
+		display_name="vrf1"
+		layer3_multicast=true
+		vzany=false
+	  }
+
+    resource "mso_schema_template_vrf" "vrf2" {
+		schema_id=mso_schema.schema1.id
+		template=mso_schema_template_vrf.vrf1.template
+		name= "VRF2"
+		display_name="vrf2"
+		layer3_multicast=true
+		vzany=false
+	  }
+
+
+	resource "mso_schema_template_l3out" "template_l3out" {
+		schema_id = mso_schema.schema1.id
+		template_name = mso_schema_template_vrf.vrf2.template
 		l3out_name = "l3out3"
-		display_name = "l3out3"
-		vrf_name = "%v"
+		display_name = "check2"
+		vrf_name = "%s"
 	}
+
 `, name)
 }
 
-func testAccCheckMSOSchemaTemplateL3outExists(l3outName string, ss *TemplateL3out) resource.TestCheckFunc {
+func testAccCheckMSOSchemaTemplateL3outExists(schemaName string, l3outName string, ss *TemplateL3out) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		client := testAccProvider.Meta().(*client.Client)
-		rs1, err1 := s.RootModule().Resources[l3outName]
-
+		rs1, err1 := s.RootModule().Resources[schemaName]
+		rs2, err2 := s.RootModule().Resources[l3outName]
 		if !err1 {
+			return fmt.Errorf("Schema %s not found", schemaName)
+		}
+		if !err2 {
 			return fmt.Errorf("L3out %s not found", l3outName)
 		}
-		if rs1.Primary.ID == "" {
+		if rs2.Primary.ID == "" {
 			return fmt.Errorf("No Schema id was set")
 		}
 
-		cont, err := client.GetViaURL("api/v1/schemas/5c6c16d7270000c710f8094d")
+		cont, err := client.GetViaURL("api/v1/schemas/" + rs1.Primary.ID)
 		if err != nil {
 			return err
 		}
@@ -131,11 +166,14 @@ func testAccCheckMSOSchemaTemplateL3outExists(l3outName string, ss *TemplateL3ou
 
 func testAccCheckMSOSchemaTemplateL3outDestroy(s *terraform.State) error {
 	client := testAccProvider.Meta().(*client.Client)
-
+	rs1, err1 := s.RootModule().Resources["mso_schema.schema1"]
+	if !err1 {
+		return fmt.Errorf("Schema %s not found", "mso_schema.schema1")
+	}
 	for _, rs := range s.RootModule().Resources {
 
 		if rs.Type == "mso_schema_template_l3out" {
-			cont, err := client.GetViaURL("api/v1/schemas/5c6c16d7270000c710f8094d")
+			cont, err := client.GetViaURL("api/v1/schemas/" + rs1.Primary.ID)
 			if err != nil {
 				return nil
 			} else {
@@ -173,8 +211,8 @@ func testAccCheckMSOSchemaTemplateL3outDestroy(s *terraform.State) error {
 }
 func testAccCheckMSOSchemaTemplateL3outAttributes(vrf_name string, ss *TemplateL3out) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
-		if "l3out3" != ss.display_name {
-			return fmt.Errorf("Bad Template L3out display name %s", ss.display_name)
+		if "VRF" != ss.vrf_name {
+			return fmt.Errorf("Bad Template VRF name %s", ss.vrf_name)
 		}
 
 		return nil
diff --git a/mso/resource_mso_schema_template_test.go b/mso/resource_mso_schema_template_test.go
index 8cf52e72..1ed4b29d 100644
--- a/mso/resource_mso_schema_template_test.go
+++ b/mso/resource_mso_schema_template_test.go
@@ -18,12 +18,17 @@ func TestAccMSOSchemaTemplate_Basic(t *testing.T) {
 		CheckDestroy: testAccCheckMSOSchemaTemplateDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCheckMSOSchemaTemplateConfig_basic("Temp1"),
+				Config: testAccCheckMSOSchemaTemplateConfig_basic("Temp2"),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckMSOSchemaTemplateExists("mso_schema.schema1", "mso_schema_template.sample1", &ss),
-					testAccCheckMSOSchemaTemplateAttributes("Temp1", &ss),
+					testAccCheckMSOSchemaTemplateAttributes("Temp2", &ss),
 				),
 			},
+			{
+				ResourceName:      "mso_schema_template.sample1",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
@@ -36,17 +41,17 @@ func TestAccMSOSchemaTemplate_Update(t *testing.T) {
 		CheckDestroy: testAccCheckMSOSchemaTemplateDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCheckMSOSchemaTemplateConfig_basic("Temp1"),
+				Config: testAccCheckMSOSchemaTemplateConfig_basic("Temp2"),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckMSOSchemaTemplateExists("mso_schema.schema1", "mso_schema_template.sample1", &ss),
-					testAccCheckMSOSchemaTemplateAttributes("Temp1", &ss),
+					testAccCheckMSOSchemaTemplateAttributes("Temp2", &ss),
 				),
 			},
 			{
-				Config: testAccCheckMSOSchemaTemplateConfig_basic("Temp2"),
+				Config: testAccCheckMSOSchemaTemplateConfig_basic("Temp"),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckMSOSchemaTemplateExists("mso_schema.schema1", "mso_schema_template.sample1", &ss),
-					testAccCheckMSOSchemaTemplateAttributes("Temp2", &ss),
+					testAccCheckMSOSchemaTemplateAttributes("Temp", &ss),
 				),
 			},
 		},
@@ -56,17 +61,17 @@ func TestAccMSOSchemaTemplate_Update(t *testing.T) {
 func testAccCheckMSOSchemaTemplateConfig_basic(displayName string) string {
 	return fmt.Sprintf(`
 	resource "mso_schema" "schema1" {
-  name          = "shah2"
-  template_name = "temp3"
-  tenant_id     = "5e9d09482c000068500a269a"
+		name          = "Schema2"
+		template_name = "Template1"
+		tenant_id     = "5fb5fed8520000452a9e8911"
 
 }
 
-resource "mso_schema_template" "sample1" {
-  schema_id = "${mso_schema.schema1.id}"
-  name = "Temp200"
-  display_name = "%v"
-  tenant_id = "5c4d9f3d2700007e01f80949"
+	resource "mso_schema_template" "sample1" {
+		schema_id = mso_schema.schema1.id
+		name = "Template2"
+		display_name = "%v"
+		tenant_id = "5fb5fed8520000452a9e8911"
   
 }`, displayName)
 }
@@ -91,7 +96,7 @@ func testAccCheckMSOSchemaTemplateExists(schemaName string, schemaTemplateName s
 			return fmt.Errorf("No Schema Template id was set")
 		}
 
-		cont, err := client.GetViaURL(fmt.Sprintf("api/v1/schemas/%s", rs1.Primary.ID))
+		cont, err := client.GetViaURL("api/v1/schemas/" + rs1.Primary.ID)
 		if err != nil {
 			return err
 		}
diff --git a/mso/resource_mso_schema_template_vrf.go b/mso/resource_mso_schema_template_vrf.go
index 326311ad..83cf95b5 100644
--- a/mso/resource_mso_schema_template_vrf.go
+++ b/mso/resource_mso_schema_template_vrf.go
@@ -267,7 +267,7 @@ func resourceMSOSchemaTemplateVrfRead(d *schema.ResourceData, m interface{}) err
 				log.Println("currentvrfname", currentVrfName)
 				if currentVrfName == vrfName {
 					log.Println("found correct vrfname")
-					d.SetId(currentVrfName)
+					d.SetId(schemaId + "/templates/" + currentTemplateName + "/vrfs/" + currentVrfName)
 					d.Set("name", currentVrfName)
 					if vrfCont.Exists("displayName") {
 						d.Set("display_name", models.StripQuotes(vrfCont.S("displayName").String()))
diff --git a/mso/resource_mso_schema_template_vrf_test.go b/mso/resource_mso_schema_template_vrf_test.go
index 5e2b5e4d..d378d31e 100644
--- a/mso/resource_mso_schema_template_vrf_test.go
+++ b/mso/resource_mso_schema_template_vrf_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccSchemaTemplateVrf_Basic(t *testing.T) {
+func TestAccMSOSchemaTemplateVrf_Basic(t *testing.T) {
 	var s SchemaTemplateVrfTest
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -19,17 +19,22 @@ func TestAccSchemaTemplateVrf_Basic(t *testing.T) {
 		CheckDestroy: testAccCheckMsoSchemaTemplateVrfDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCheckMsoSchemaTemplateVrfConfig_basic("vrf982"),
+				Config: testAccCheckMsoSchemaTemplateVrfConfig_basic("VRF1"),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckMsoSchemaTemplateVrfExists("mso_schema.schema1", "mso_schema_template_vrf.vrf1", &s),
-					testAccCheckMsoSchemaTemplateVrfAttributes("vrf982", &s),
+					testAccCheckMsoSchemaTemplateVrfAttributes("VRF1", &s),
 				),
 			},
+			{
+				ResourceName:      "mso_schema_template_vrf.vrf1",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
 
-func TestAccMsoSchemaTemplateVrf_Update(t *testing.T) {
+func TestAccMSOSchemaTemplateVrf_Update(t *testing.T) {
 	var s SchemaTemplateVrfTest
 
 	resource.Test(t, resource.TestCase{
@@ -38,17 +43,17 @@ func TestAccMsoSchemaTemplateVrf_Update(t *testing.T) {
 		CheckDestroy: testAccCheckMsoSchemaTemplateVrfDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCheckMsoSchemaTemplateVrfConfig_basic("vrf982"),
+				Config: testAccCheckMsoSchemaTemplateVrfConfig_basic("VRF1"),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckMsoSchemaTemplateVrfExists("mso_schema.schema1", "mso_schema_template_vrf.vrf1", &s),
-					testAccCheckMsoSchemaTemplateVrfAttributes("vrf982", &s),
+					testAccCheckMsoSchemaTemplateVrfAttributes("VRF1", &s),
 				),
 			},
 			{
-				Config: testAccCheckMsoSchemaTemplateVrfConfig_basic("vrf983"),
+				Config: testAccCheckMsoSchemaTemplateVrfConfig_basic("VRF2"),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckMsoSchemaTemplateVrfExists("mso_schema.schema1", "mso_schema_template_vrf.vrf1", &s),
-					testAccCheckMsoSchemaTemplateVrfAttributes("vrf983", &s),
+					testAccCheckMsoSchemaTemplateVrfAttributes("VRF2", &s),
 				),
 			},
 		},
@@ -59,16 +64,16 @@ func testAccCheckMsoSchemaTemplateVrfConfig_basic(name string) string {
 	return fmt.Sprintf(`
 
 	resource "mso_schema" "schema1" {
-		name          = "shah8"
-		template_name = "temp5"
-		tenant_id     = "5e9d09482c000068500a269a"
+		name          = "Schema2"
+		template_name = "Template1"
+		tenant_id     = "5fb5fed8520000452a9e8911"
 	  
 	  }
 
 	resource "mso_schema_template_vrf" "vrf1" {
-		schema_id="${mso_schema.schema1.id}"
-		template="temp5"
-		name= "vrf982"
+		schema_id=mso_schema.schema1.id
+		template="Template1"
+		name= "VRF"
 		display_name="%s"
 		layer3_multicast=true
 		vzany=false
diff --git a/mso/resource_mso_schema_test.go b/mso/resource_mso_schema_test.go
index e44583ca..2358d8fc 100644
--- a/mso/resource_mso_schema_test.go
+++ b/mso/resource_mso_schema_test.go
@@ -26,6 +26,11 @@ func TestAccMSOSchema_Basic(t *testing.T) {
 					testAccCheckMSOSchemaAttributes("nkp1003", &s),
 				),
 			},
+			{
+				ResourceName:      "mso_schema.schema1",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
@@ -59,12 +64,12 @@ func TestAccMSOSchema_Update(t *testing.T) {
 func testAccCheckMSOSchemaConfig_basic(name string) string {
 	return fmt.Sprintf(`
 	resource "mso_schema" "schema1" {
-		name          = "nkp1003"
+		name          = "%s"
 		template_name = "temp1"
-		tenant_id     = "5e9d09482c000068500a269a"
+		tenant_id     = "5fb5fed8520000452a9e8911"
 
 	  }
-	`)
+	`, name)
 }
 
 func testAccCheckMSOSchemaExists(schemaName string, st *SchemaTest) resource.TestCheckFunc {
diff --git a/mso/resource_mso_template_bd.go b/mso/resource_mso_template_bd.go
index 19a89075..abafe03b 100644
--- a/mso/resource_mso_template_bd.go
+++ b/mso/resource_mso_template_bd.go
@@ -174,15 +174,15 @@ func resourceMSOTemplateBDImport(d *schema.ResourceData, m interface{}) ([]*sche
 						d.Set("intersite_bum_traffic", bdCont.S("intersiteBumTrafficAllow").Data().(bool))
 					}
 
-					if bdCont.Exists("optimize_wan_bandwidth") {
+					if bdCont.Exists("optimizeWanBandwidth") {
 						d.Set("optimize_wan_bandwidth", bdCont.S("optimizeWanBandwidth").Data().(bool))
 					}
 
-					if bdCont.Exists("layer3_multicast") {
+					if bdCont.Exists("l3MCast") {
 						d.Set("layer3_multicast", bdCont.S("l3MCast").Data().(bool))
 					}
 
-					if bdCont.Exists("layer2_stretch") {
+					if bdCont.Exists("l2Stretch") {
 						d.Set("layer2_stretch", bdCont.S("l2Stretch").Data().(bool))
 					}
 
@@ -351,7 +351,7 @@ func resourceMSOTemplateBDRead(d *schema.ResourceData, m interface{}) error {
 				}
 				apiBD := models.StripQuotes(bdCont.S("name").String())
 				if apiBD == stateBD {
-					d.SetId(apiBD)
+					d.SetId(schemaId + "/template/" + apiTemplate + "/bd/" + apiBD)
 					d.Set("name", apiBD)
 					d.Set("schema_id", schemaId)
 					d.Set("template_name", apiTemplate)
diff --git a/mso/resource_mso_template_bd_test.go b/mso/resource_mso_template_bd_test.go
index fb41f968..3137e25d 100644
--- a/mso/resource_mso_template_bd_test.go
+++ b/mso/resource_mso_template_bd_test.go
@@ -21,10 +21,15 @@ func TestAccMSOSchemaTemplateBD_Basic(t *testing.T) {
 			{
 				Config: testAccCheckMSOTemplateBDConfig_basic("flood"),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckMSOSchemaTemplateBDExists("mso_schema_template_bd.bridge_domain", &ss),
+					testAccCheckMSOSchemaTemplateBDExists("mso_schema.schema1", "mso_schema_template_bd.bridge_domain", &ss),
 					testAccCheckMSOSchemaTemplateBDAttributes("flood", &ss),
 				),
 			},
+			{
+				ResourceName:      "mso_schema_template_bd.bridge_domain",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
@@ -40,14 +45,14 @@ func TestAccMSOSchemaTemplateBD_Update(t *testing.T) {
 			{
 				Config: testAccCheckMSOTemplateBDConfig_basic("flood"),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckMSOSchemaTemplateBDExists("mso_schema_template_bd.bridge_domain", &ss),
+					testAccCheckMSOSchemaTemplateBDExists("mso_schema.schema1", "mso_schema_template_bd.bridge_domain", &ss),
 					testAccCheckMSOSchemaTemplateBDAttributes("flood", &ss),
 				),
 			},
 			{
 				Config: testAccCheckMSOTemplateBDConfig_basic("proxy"),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckMSOSchemaTemplateBDExists("mso_schema_template_bd.bridge_domain", &ss),
+					testAccCheckMSOSchemaTemplateBDExists("mso_schema.schema1", "mso_schema_template_bd.bridge_domain", &ss),
 					testAccCheckMSOSchemaTemplateBDAttributes("proxy", &ss),
 				),
 			},
@@ -57,30 +62,64 @@ func TestAccMSOSchemaTemplateBD_Update(t *testing.T) {
 
 func testAccCheckMSOTemplateBDConfig_basic(unicast string) string {
 	return fmt.Sprintf(`
+
+	 resource "mso_schema" "schema1" {
+		name          = "Schema2"
+		template_name = "Template1"
+		tenant_id     = "5fb5fed8520000452a9e8911"
+	  
+	  }
+
+	  resource "mso_schema_template_vrf" "vrf1" {
+		schema_id=mso_schema.schema1.id
+		template=mso_schema.schema1.template_name
+		name= "VRF"
+		display_name="vrf1"
+		layer3_multicast=true
+		vzany=false
+	  }
+
 	resource "mso_schema_template_bd" "bridge_domain" {
-		schema_id = "5ea809672c00003bc40a2799"
+		schema_id = mso_schema.schema1.id
 		template_name = "Template1"
-		name = "testAccBD"
-		display_name = "testAcc"
-		vrf_name = "demo"
+		name = "BD"
+		display_name = "bd1"
+		vrf_name = mso_schema_template_vrf.vrf1.name
+		intersite_bum_traffic=true
+		optimize_wan_bandwidth=true
+		layer2_stretch=true
+		layer3_multicast=true
 		layer2_unknown_unicast = "%s" 
+		dhcp_policy ={
+			name="dh"
+			version=1
+			dhcp_option_policy_name="dho"
+			dhcp_option_policy_version=1
+		}
 	}
 `, unicast)
 }
 
-func testAccCheckMSOSchemaTemplateBDExists(bdName string, ss *TemplateBD) resource.TestCheckFunc {
+func testAccCheckMSOSchemaTemplateBDExists(schemaName string, bdName string, ss *TemplateBD) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		client := testAccProvider.Meta().(*client.Client)
-		rs1, err1 := s.RootModule().Resources[bdName]
+		rs1, err1 := s.RootModule().Resources[schemaName]
+		rs2, err2 := s.RootModule().Resources[bdName]
 
 		if !err1 {
+			return fmt.Errorf("Schema %s not found", schemaName)
+		}
+		if !err2 {
 			return fmt.Errorf("BD %s not found", bdName)
 		}
 		if rs1.Primary.ID == "" {
 			return fmt.Errorf("No Schema id was set")
 		}
+		if rs2.Primary.ID == "" {
+			return fmt.Errorf("No BD was set")
+		}
 
-		cont, err := client.GetViaURL("api/v1/schemas/5ea809672c00003bc40a2799")
+		cont, err := client.GetViaURL("api/v1/schemas/" + rs1.Primary.ID)
 		if err != nil {
 			return err
 		}
@@ -108,7 +147,7 @@ func testAccCheckMSOSchemaTemplateBDExists(bdName string, ss *TemplateBD) resour
 						return err
 					}
 					apiBD := models.StripQuotes(bdCont.S("name").String())
-					if apiBD == "testAccBD" {
+					if apiBD == "BD" {
 						tp.display_name = models.StripQuotes(bdCont.S("displayName").String())
 						tp.layer2_unknown_unicast = models.StripQuotes(bdCont.S("l2UnknownUnicast").String())
 						vrfRef := models.StripQuotes(bdCont.S("vrfRef").String())
@@ -136,11 +175,14 @@ func testAccCheckMSOSchemaTemplateBDExists(bdName string, ss *TemplateBD) resour
 
 func testAccCheckMSOSchemaTemplateBDDestroy(s *terraform.State) error {
 	client := testAccProvider.Meta().(*client.Client)
-
+	rs1, err1 := s.RootModule().Resources["mso_schema.schema1"]
+	if !err1 {
+		return fmt.Errorf("Schema %s not found", "mso_schema.schema1")
+	}
 	for _, rs := range s.RootModule().Resources {
 
 		if rs.Type == "mso_schema_template_bd" {
-			cont, err := client.GetViaURL("api/v1/schemas/5ea809672c00003bc40a2799")
+			cont, err := client.GetViaURL("api/v1/schemas/" + rs1.Primary.ID)
 			if err != nil {
 				return nil
 			} else {
@@ -165,7 +207,7 @@ func testAccCheckMSOSchemaTemplateBDDestroy(s *terraform.State) error {
 								return err
 							}
 							apiBD := models.StripQuotes(bdCont.S("name").String())
-							if apiBD == "testAccBD" {
+							if apiBD == "BD" {
 								return fmt.Errorf("template bridge domain still exists.")
 							}
 						}
@@ -183,11 +225,11 @@ func testAccCheckMSOSchemaTemplateBDAttributes(layer2_unknown_unicast string, ss
 			return fmt.Errorf("Bad Template BD layer2_unknown_unicast %s", ss.layer2_unknown_unicast)
 		}
 
-		if "testAcc" != ss.display_name {
+		if "bd1" != ss.display_name {
 			return fmt.Errorf("Bad Template BD display name %s", ss.display_name)
 		}
 
-		if "demo" != ss.vrf_name {
+		if "VRF" != ss.vrf_name {
 			return fmt.Errorf("Bad Template BD VRF name %s", ss.vrf_name)
 		}
 		return nil
diff --git a/website/docs/r/schema_template_filter_entry.html.markdown b/website/docs/r/schema_template_filter_entry.html.markdown
index 662240d4..9e53686c 100644
--- a/website/docs/r/schema_template_filter_entry.html.markdown
+++ b/website/docs/r/schema_template_filter_entry.html.markdown
@@ -59,5 +59,5 @@ No attributes are exported.
 An existing MSO Resource Schema Template Filter Entry can be [imported][docs-import] into this resource via its Id/path, via the following command: [docs-import]: <https://www.terraform.io/docs/import/index.html>
 
 ```bash
-terraform import mso_schema_template_filter_entry.filter_entry {schema_id}/template/{template_name}/filter/{name}
+terraform import mso_schema_template_filter_entry.filter_entry {schema_id}/template/{template_name}/filter/{filter_name}/filter_entry/{name}
 ```
\ No newline at end of file