diff --git a/src/device/service/drivers/openconfig/OpenConfigDriver.py b/src/device/service/drivers/openconfig/OpenConfigDriver.py
index 4965ced4e961cc5ca530f85ddbe35f9e28815f3c..b282178989fa3f357a77fd6a1aa8fb6900fd430d 100644
--- a/src/device/service/drivers/openconfig/OpenConfigDriver.py
+++ b/src/device/service/drivers/openconfig/OpenConfigDriver.py
@@ -395,4 +395,3 @@ class OpenConfigDriver(_Driver):
                 return
             if sample is None: continue
             yield sample
-            
\ No newline at end of file
diff --git a/src/device/service/drivers/openconfig/templates/__init__.py b/src/device/service/drivers/openconfig/templates/__init__.py
index a6825ea41cb5e2b01d4309c84f01a3dd3fe16d6f..901f5cf0291dca1bda155e20abd16db5989df7dc 100644
--- a/src/device/service/drivers/openconfig/templates/__init__.py
+++ b/src/device/service/drivers/openconfig/templates/__init__.py
@@ -16,7 +16,7 @@ import json, logging, lxml.etree as ET, re
 from typing import Any, Dict
 from jinja2 import Environment, PackageLoader, select_autoescape
 from device.service.driver_api._Driver import (
-    RESOURCE_ENDPOINTS, RESOURCE_INTERFACES, RESOURCE_NETWORK_INSTANCES, RESOURCE_ROUTING_POLICIES,RESOURCE_ACL)
+    RESOURCE_ENDPOINTS, RESOURCE_INTERFACES, RESOURCE_NETWORK_INSTANCES, RESOURCE_ROUTING_POLICIES, RESOURCE_ACL)
 from .EndPoints import parse as parse_endpoints
 from .Interfaces import parse as parse_interfaces, parse_counters
 from .NetworkInstances import parse as parse_network_instances
diff --git a/src/device/tests/Device_OpenConfig_Template.py b/src/device/tests/Device_OpenConfig_Template.py
index d95e86dfa5338ecc2c794f4e317c67fdf96f3353..6afa2721ff920c39de243b308b9b9a4749cb013b 100644
--- a/src/device/tests/Device_OpenConfig_Template.py
+++ b/src/device/tests/Device_OpenConfig_Template.py
@@ -28,7 +28,7 @@ DEVICE_OC    = json_device_packetrouter_disabled(DEVICE_OC_UUID)
 DEVICE_OC_CONNECT_RULES = json_device_connect_rules(DEVICE_OC_ADDRESS, DEVICE_OC_PORT, {
     'username'       : DEVICE_OC_USERNAME,
     'password'       : DEVICE_OC_PASSWORD,
-    'force_running'  : True,
+    'force_running'  : False,
     'hostkey_verify' : True,
     'look_for_keys'  : True,
     'allow_agent'    : True,