Clean up bad cherry picks for tests

Author: mitchellh

config/raw_config_test.go

@@ -320,7 +320,7 @@ func TestRawConfig_sliceIndexLoss(t *testing.T) {
 	vars := map[string]ast.Variable{
 		"var.unknown": ast.Variable{
 			Value: UnknownVariableValue,
-			Type:  ast.TypeUnknown,
+			Type:  ast.TypeString,
 		},
 		"var.known": ast.Variable{
 			Value: "123456",

helper/schema/schema_test.go

@@ -2493,8 +2493,7 @@ func TestSchemaMap_Diff(t *testing.T) {
 			Err: false,
 		},
 
-		{
-			Name: "Set ForceNew marks count as ForceNew if computed",
+		"Set ForceNew marks count as ForceNew if computed": {
 			Schema: map[string]*Schema{
 				"ports": &Schema{
 					Type:     TypeSet,