diff --git a/openapi/openapi_spec_resource_schema_definition_property.go b/openapi/openapi_spec_resource_schema_definition_property.go
index b1d76e2fb..fe5164704 100644
--- a/openapi/openapi_spec_resource_schema_definition_property.go
+++ b/openapi/openapi_spec_resource_schema_definition_property.go
@@ -225,7 +225,7 @@ func (s *specSchemaDefinitionProperty) terraformSchema() (*schema.Schema, error)
 		}
 		objectSchema, err := s.terraformObjectSchema()
 		if err != nil {
-			return nil, err
+			return nil, err //untested
 		}
 		terraformSchema.Elem = objectSchema
 
diff --git a/openapi/provider_factory.go b/openapi/provider_factory.go
index b9d8bc465..6b312fff0 100644
--- a/openapi/provider_factory.go
+++ b/openapi/provider_factory.go
@@ -2,13 +2,15 @@ package openapi
 
 import (
 	"fmt"
-	"github.com/dikhan/terraform-provider-openapi/openapi/terraformutils"
 	"net/http"
 	"time"
 
+	"github.com/dikhan/terraform-provider-openapi/openapi/terraformutils"
+
+	"log"
+
 	"github.com/dikhan/http_goclient"
 	"github.com/hashicorp/terraform/helper/schema"
-	"log"
 )
 
 type providerFactory struct {
@@ -171,7 +173,7 @@ func (p providerFactory) createTerraformProviderResourceMap() (map[string]*schem
 	resourceMap := map[string]*schema.Resource{}
 	openAPIResources, err := p.specAnalyser.GetTerraformCompliantResources()
 	if err != nil {
-		return nil, err
+		return nil, err //untested
 	}
 	for _, openAPIResource := range openAPIResources {
 		start := time.Now()
@@ -182,11 +184,11 @@ func (p providerFactory) createTerraformProviderResourceMap() (map[string]*schem
 		r := newResourceFactory(openAPIResource)
 		resource, err := r.createTerraformResource()
 		if err != nil {
-			return nil, err
+			return nil, err //untested
 		}
 		resourceName, err := p.getProviderResourceName(openAPIResource.getResourceName())
 		if err != nil {
-			return nil, err
+			return nil, err //untested
 		}
 		log.Printf("[INFO] resource '%s' successfully registered in the provider (time:%s)", resourceName, time.Since(start))
 		resourceMap[resourceName] = resource
diff --git a/openapi/resource_factory.go b/openapi/resource_factory.go
index bd5810662..116f42ac0 100644
--- a/openapi/resource_factory.go
+++ b/openapi/resource_factory.go
@@ -600,7 +600,7 @@ func (r resourceFactory) createPayloadFromLocalStateData(resourceLocalData *sche
 
 func (r resourceFactory) getPropertyPayload(input map[string]interface{}, property *specSchemaDefinitionProperty, dataValue interface{}) error {
 	if dataValue == nil {
-		return fmt.Errorf("property '%s' has a nil state dataValue", property.Name)
+		return fmt.Errorf("property '%s' has a nil state dataValue", property.Name) //untested
 	}
 	dataValueKind := reflect.TypeOf(dataValue).Kind()
 	switch dataValueKind {
@@ -610,10 +610,10 @@ func (r resourceFactory) getPropertyPayload(input map[string]interface{}, proper
 		for propertyName, propertyValue := range mapValue {
 			schemaDefinitionProperty, err := property.SpecSchemaDefinition.getPropertyBasedOnTerraformName(propertyName)
 			if err != nil {
-				return err
+				return err //untested
 			}
 			if err := r.getPropertyPayload(objectInput, schemaDefinitionProperty, propertyValue); err != nil {
-				return err
+				return err //untested
 			}
 		}
 		input[property.Name] = objectInput
@@ -630,7 +630,7 @@ func (r resourceFactory) getPropertyPayload(input map[string]interface{}, proper
 					return fmt.Errorf("something is really wrong here...an object property with nested objects should have exactly one elem in the terraform state list")
 				}
 				if err := r.getPropertyPayload(input, property, arrayValue[0]); err != nil {
-					return err
+					return err //untested
 				}
 			} else {
 				arrayInput := []interface{}{}
@@ -638,7 +638,7 @@ func (r resourceFactory) getPropertyPayload(input map[string]interface{}, proper
 				for _, arrayItem := range arrayValue {
 					objectInput := map[string]interface{}{}
 					if err := r.getPropertyPayload(objectInput, property, arrayItem); err != nil {
-						return err
+						return err //untested
 					}
 					// Only assign the value of the object, otherwise a dup key will be assigned which will cause problems. Example
 					// [propertyName: listeners; propertyValue: [map[options:[] origin_ingress_port:80 protocol:http shield_ingress_port:80]]]