diff --git a/test/mocks/datafilecollector-testharness/dr-sim/docker-compose.yml b/test/mocks/datafilecollector-testharness/dr-sim/docker-compose.yml
index efcc33f..e60a742 100644
--- a/test/mocks/datafilecollector-testharness/dr-sim/docker-compose.yml
+++ b/test/mocks/datafilecollector-testharness/dr-sim/docker-compose.yml
@@ -3,15 +3,15 @@
   drsim:
     image: drsim_common:latest
     ports:
-     - "3906:3906"
-     - "3907:3907"
+      - "3906:3906"
+      - "3907:3907"
     container_name: drsim
     command: node dmaapDR.js
 
   drsim_redir:
     image: drsim_common:latest
     ports:
-     - "3908:3908"
-     - "3909:3909"
+      - "3908:3908"
+      - "3909:3909"
     container_name: drsim_redir
     command: node dmaapDR_redir.js
diff --git a/test/mocks/datafilecollector-testharness/mr-sim/docker-compose.yml b/test/mocks/datafilecollector-testharness/mr-sim/docker-compose.yml
index ff8aa29..cc7cafd 100644
--- a/test/mocks/datafilecollector-testharness/mr-sim/docker-compose.yml
+++ b/test/mocks/datafilecollector-testharness/mr-sim/docker-compose.yml
@@ -4,8 +4,8 @@
   mrsim:
     image: mrsim:latest
     ports:
-     - "2222:2222"
-     - "2223:2223"
+      - "2222:2222"
+      - "2223:2223"
     container_name: mrsim
     command: python mr-sim.py --tc100
 # Change -tc100 to other tc number for desired behavior.
diff --git a/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-template.yml b/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-template.yml
index 88b2afd..e853efd 100644
--- a/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-template.yml
+++ b/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-template.yml
@@ -1,9 +1,9 @@
 version: '2'
 
 networks:
-   dfcnet:
-      external:
-         name: dfcnet
+  dfcnet:
+    external:
+      name: dfcnet
 
 services:
 
@@ -41,12 +41,12 @@
     networks:
       - dfcnet
     environment:
-        DRR_SIM_IP: ${DR_REDIR_SIM}
-        DR_FEEDS: ${DR_FEEDS}
+      DRR_SIM_IP: ${DR_REDIR_SIM}
+      DR_FEEDS: ${DR_FEEDS}
     image: drsim_common:latest
     ports:
-     - "3906:3906"
-     - "3907:3907"
+      - "3906:3906"
+      - "3907:3907"
     container_name: dfc_dr-sim
     command: node dmaapDR.js ${DR_TC}
     volumes:
@@ -58,12 +58,12 @@
     networks:
       - dfcnet
     environment:
-        DR_SIM_IP: drsim
-        DR_REDIR_FEEDS: ${DR_REDIR_FEEDS}
+      DR_SIM_IP: drsim
+      DR_REDIR_FEEDS: ${DR_REDIR_FEEDS}
     image: drsim_common:latest
     ports:
-     - "3908:3908"
-     - "3909:3909"
+      - "3908:3908"
+      - "3909:3909"
     container_name: dfc_dr-redir-sim
     command: node dmaapDR_redir.js ${DR_REDIR_TC}
     volumes:
@@ -75,11 +75,11 @@
     networks:
       - dfcnet
     environment:
-        SFTP_SIMS: ${SFTP_SIMS}
-        FTPS_SIMS: ${FTPS_SIMS}
-        NUM_FTP_SERVERS: ${NUM_FTP_SERVERS}
-        MR_GROUPS: ${MR_GROUPS}
-        MR_FILE_PREFIX_MAPPING: ${MR_FILE_PREFIX_MAPPING}
+      SFTP_SIMS: ${SFTP_SIMS}
+      FTPS_SIMS: ${FTPS_SIMS}
+      NUM_FTP_SERVERS: ${NUM_FTP_SERVERS}
+      MR_GROUPS: ${MR_GROUPS}
+      MR_FILE_PREFIX_MAPPING: ${MR_FILE_PREFIX_MAPPING}
     image: mrsim:latest
     ports:
       - "2222:2222"
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/deployment/PnP_PNF_sim_heat_template.yml b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/deployment/PnP_PNF_sim_heat_template.yml
index 76719ae..6f9b5f0 100644
--- a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/deployment/PnP_PNF_sim_heat_template.yml
+++ b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/deployment/PnP_PNF_sim_heat_template.yml
@@ -2,12 +2,12 @@
 heat_template_version: '2013-05-23'
 parameters:
   flavor_name: {description: Type of instance (flavor) to be used, label: Flavor,
-    type: string}
+                type: string}
   image_name: {description: Image to be used for compute instance, label: Image name
-      or ID, type: string}
+               or ID, type: string}
   key_name: {description: Public/Private key pair name, label: Key pair name, type: string}
   public_net_id: {description: Public network that enables remote connection to VNF,
-    label: Public network name or ID, type: string}
+                  label: Public network name or ID, type: string}
   private_net_id: {type: string, description: Private network id, label: Private network name or ID}
   private_subnet_id: {type: string, description: Private subnet id, label: Private subnetwork name or ID}
   proxy: {type: string, description: Proxy, label: Proxy, default: ""}
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/docker-compose-template.yml b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/docker-compose-template.yml
index a4bbcd9..a13a76b 100644
--- a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/docker-compose-template.yml
+++ b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/docker-compose-template.yml
@@ -45,8 +45,8 @@
       front-${I}:
         ipv4_address: "${IPFTPS}"
     ports:
-       - "${PORTFTPS}:21"
-       - "${FTPS_PASV_MIN}-${FTPS_PASV_MAX}:${FTPS_PASV_MIN}-${FTPS_PASV_MAX}"
+      - "${PORTFTPS}:21"
+      - "${FTPS_PASV_MIN}-${FTPS_PASV_MAX}:${FTPS_PASV_MIN}-${FTPS_PASV_MAX}"
     environment:
       FTP_USER: onap
       FTP_PASSWORD: pano
diff --git a/test/mocks/pnf-onboarding/src/main/resources/csarContent/Definitions/etsi_nfv_sol001_vnfd_2_5_1_types.yaml b/test/mocks/pnf-onboarding/src/main/resources/csarContent/Definitions/etsi_nfv_sol001_vnfd_2_5_1_types.yaml
index c0ca061..63e8b2e 100644
--- a/test/mocks/pnf-onboarding/src/main/resources/csarContent/Definitions/etsi_nfv_sol001_vnfd_2_5_1_types.yaml
+++ b/test/mocks/pnf-onboarding/src/main/resources/csarContent/Definitions/etsi_nfv_sol001_vnfd_2_5_1_types.yaml
@@ -264,19 +264,19 @@
     description: describes one protocol layer and associated protocol data for a given virtual link used in a specific VNF deployment flavour
     properties:
       associated_layer_protocol:
-         type: string
-         description: Identifies one of the protocols a virtualLink gives access to (ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire) as specified by the connectivity_type property.
-         required: true
-         constraints:
-           - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire ]
+        type: string
+        description: Identifies one of the protocols a virtualLink gives access to (ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire) as specified by the connectivity_type property.
+        required: true
+        constraints:
+          - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire ]
       l2_protocol_data:
-         type: tosca.datatypes.nfv.L2ProtocolData
-         description: Specifies the L2 protocol data for a virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L2 protocol and shall be absent otherwise.
-         required: false
+        type: tosca.datatypes.nfv.L2ProtocolData
+        description: Specifies the L2 protocol data for a virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L2 protocol and shall be absent otherwise.
+        required: false
       l3_protocol_data:
-         type: tosca.datatypes.nfv.L3ProtocolData
-         description: Specifies the L3 protocol data for this virtual link.  Shall be present when the associatedLayerProtocol attribute indicates a L3 protocol and shall be absent otherwise.
-         required: false
+        type: tosca.datatypes.nfv.L3ProtocolData
+        description: Specifies the L3 protocol data for this virtual link.  Shall be present when the associatedLayerProtocol attribute indicates a L3 protocol and shall be absent otherwise.
+        required: false
 
   tosca.datatypes.nfv.L2ProtocolData:
     derived_from: tosca.datatypes.Root
@@ -548,7 +548,7 @@
         description: Specifies the maximum packet loss ratio
         required: false
         constraints:
-           - in_range: [ 0.0, 1.0 ]
+          - in_range: [ 0.0, 1.0 ]
 
   tosca.datatypes.nfv.VnfConfigurableProperties:
     derived_from: tosca.datatypes.Root
@@ -702,26 +702,26 @@
         default: false
 
   tosca.datatypes.nfv.VirtualObjectStorageData:
-      derived_from: tosca.datatypes.Root
-      description: VirtualObjectStorageData describes object storage requirements associated with compute resources in a particular VDU
-      properties:
-        max_size_of_storage:
-          type: scalar-unit.size
-          description: Maximum size of virtualized storage resource
-          required: false
+    derived_from: tosca.datatypes.Root
+    description: VirtualObjectStorageData describes object storage requirements associated with compute resources in a particular VDU
+    properties:
+      max_size_of_storage:
+        type: scalar-unit.size
+        description: Maximum size of virtualized storage resource
+        required: false
 
   tosca.datatypes.nfv.VirtualFileStorageData:
-      derived_from: tosca.datatypes.Root
-      description: VirtualFileStorageData describes file storage requirements associated with compute resources in a particular VDU
-      properties:
-        size_of_storage:
-          type: scalar-unit.size
-          description: Size of virtualized storage resource
-          required: true
-        file_system_protocol:
-          type: string
-          description: The shared file system protocol (e.g. NFS, CIFS)
-          required: true
+    derived_from: tosca.datatypes.Root
+    description: VirtualFileStorageData describes file storage requirements associated with compute resources in a particular VDU
+    properties:
+      size_of_storage:
+        type: scalar-unit.size
+        description: Size of virtualized storage resource
+        required: true
+      file_system_protocol:
+        type: string
+        description: The shared file system protocol (e.g. NFS, CIFS)
+        required: true
 
   tosca.datatypes.nfv.VirtualLinkBitrateLevel:
     derived_from: tosca.datatypes.Root
@@ -802,7 +802,7 @@
         description: Identifies a performance metric derived from those defined in ETSI GS NFV-IFA 027.The packetOutgoingVirtualLink and packetIncomingVirtualLink metrics shall be obtained by aggregation the PacketOutgoing and PacketIncoming measurements defined in clause 7.1 of GS NFV-IFA 027 of all virtual link ports attached to the virtual link to which the metrics apply.
         required: true
         constraints:
-           - valid_values: [ packet_outgoing_virtual_link, packet_incoming_virtual_link ]
+          - valid_values: [ packet_outgoing_virtual_link, packet_incoming_virtual_link ]
       collection_period:
         type: scalar-unit.time
         description: Describes the recommended periodicity at which to collect the performance information.
@@ -917,18 +917,18 @@
         description: Describes the Logical Node requirements
         required: false
         entry_schema:
-           type: tosca.datatypes.nfv.LogicalNodeData
+          type: tosca.datatypes.nfv.LogicalNodeData
       requested_additional_capabilities:
         type: map
         description: Describes additional capability for a particular VDU
         required: false
         entry_schema:
-           type: tosca.datatypes.nfv.RequestedAdditionalCapability
+          type: tosca.datatypes.nfv.RequestedAdditionalCapability
       compute_requirements:
         type: map
         required: false
         entry_schema:
-           type: string
+          type: string
       virtual_memory:
         type: tosca.datatypes.nfv.VirtualMemory
         description: Describes virtual memory of the virtualized compute
@@ -1297,10 +1297,10 @@
         type: tosca.capabilities.nfv.VirtualStorage
         description: Defines the capabilities of virtual_storage.
     requirements:
-     - virtual_link:
-         capability: tosca.capabilities.nfv.VirtualLinkable
-         relationship: tosca.relationships.nfv.VirtualLinksTo
-         #description: Describes the requirements for linking to virtual link
+      - virtual_link:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          #description: Describes the requirements for linking to virtual link
 
   tosca.nodes.nfv.Cp:
     derived_from: tosca.nodes.Root
diff --git a/test/mocks/pnfsimulator/pnfsimulator/deployment/PnP_PNF_sim_heat_template.yml b/test/mocks/pnfsimulator/pnfsimulator/deployment/PnP_PNF_sim_heat_template.yml
index 76719ae..6f9b5f0 100644
--- a/test/mocks/pnfsimulator/pnfsimulator/deployment/PnP_PNF_sim_heat_template.yml
+++ b/test/mocks/pnfsimulator/pnfsimulator/deployment/PnP_PNF_sim_heat_template.yml
@@ -2,12 +2,12 @@
 heat_template_version: '2013-05-23'
 parameters:
   flavor_name: {description: Type of instance (flavor) to be used, label: Flavor,
-    type: string}
+                type: string}
   image_name: {description: Image to be used for compute instance, label: Image name
-      or ID, type: string}
+               or ID, type: string}
   key_name: {description: Public/Private key pair name, label: Key pair name, type: string}
   public_net_id: {description: Public network that enables remote connection to VNF,
-    label: Public network name or ID, type: string}
+                  label: Public network name or ID, type: string}
   private_net_id: {type: string, description: Private network id, label: Private network name or ID}
   private_subnet_id: {type: string, description: Private subnet id, label: Private subnetwork name or ID}
   proxy: {type: string, description: Proxy, label: Proxy, default: ""}
diff --git a/test/vcpe/preload_templates/simple_neutron_heat.yaml b/test/vcpe/preload_templates/simple_neutron_heat.yaml
index f64248b..1df0c71 100644
--- a/test/vcpe/preload_templates/simple_neutron_heat.yaml
+++ b/test/vcpe/preload_templates/simple_neutron_heat.yaml
@@ -6,9 +6,9 @@
     description: Name of the Neutron Network
     default: ONAP-NW1
   shared:
-     type: boolean
-     description: Shared amongst tenants
-     default: False
+    type: boolean
+    description: Shared amongst tenants
+    default: False
 outputs:
   network_id:
     description: Openstack network identifier