diff --git a/vid-app-common/src/test/resources/WEB-INF/conf/asdc.properties b/vid-app-common/src/test/resources/WEB-INF/conf/asdc.properties
index c16d3f5..2f688bd 100644
--- a/vid-app-common/src/test/resources/WEB-INF/conf/asdc.properties
+++ b/vid-app-common/src/test/resources/WEB-INF/conf/asdc.properties
@@ -1,4 +1,4 @@
-asdc.client.type=REST
+asdc.client.type=LOCAL
 #
 #asdc.client.rest.protocol=http
 #asdc.client.rest.host=135.21.125.36
diff --git a/vid-app-common/src/test/resources/WEB-INF/conf/system.properties b/vid-app-common/src/test/resources/WEB-INF/conf/system.properties
index 6ec6085..9da6303 100644
--- a/vid-app-common/src/test/resources/WEB-INF/conf/system.properties
+++ b/vid-app-common/src/test/resources/WEB-INF/conf/system.properties
@@ -86,7 +86,7 @@
 aai.truststore.passwd.x=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
 aai.keystore.filename=aai-client-cert.p12
 aai.keystore.passwd.x=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
-aai.use.client.cert=true
+aai.use.client.cert=false
 aai.vnf.provstatus=PREPROV,NVTPROV,PROV,CAPPED
 aai_get_version_by_invariant_id="service-design-and-creation/models?depth=2&model-invariant-id="
 
@@ -132,21 +132,19 @@
 #dev
 #mso.server.url=http://mtanjv9moah10-eth0.aic.cip.att.com:8080/ecomp/mso/infra
 #istScrum-Master
-mso.server.url=https://msoapih-app-st.ecomp.cci.att.com:8443/ecomp/mso/infra
-#mso.server.url=https://msoapih-app.mtsnj.aic.cip.att.com:8443/ecomp/mso/infra
-#mso.server.url=http://mtanjv9moah01-eth0.aic.cip.att.com:8080/ecomp/mso/infra
-#mso.server.url=http://mtanjv9moah11-eth1-0.aic.cip.att.com:8080
+mso.client.type=LOCAL
+mso.server.url=http://vm1.mso.simpledemo.openecomp.org:8080
 mso.polling.interval.msecs=10000
 mso.max.polls=10
-mso.user.name=infraportal
-mso.password.x=OBF:1ghz1kfx1j1w1m7w1i271e8q1eas1hzj1m4i1iyy1kch1gdz
-mso.restapi.svc.instance=/serviceInstances/v5
-mso.restapi.vnf.instance=/serviceInstances/v5/<service_instance_id>/vnfs
-mso.restapi.network.instance=/serviceInstances/v5/<service_instance_id>/networks
-mso.restapi.vf.module.instance=/serviceInstances/v5/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules
-mso.restapi.volume.group.instance=/serviceInstances/v5/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups
-mso.restapi.get.orc.req=/orchestrationRequests/v5
-mso.restapi.get.orc.reqs=/orchestrationRequests/v5?
+mso.user.name=InfraPortalClient
+mso.password.x=OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz
+mso.restapi.svc.instance=/ecomp/mso/infra/serviceInstances/v4
+mso.restapi.vnf.instance=/ecomp/mso/infra/serviceInstances/v4/<service_instance_id>/vnfs
+mso.restapi.network.instance=/ecomp/mso/infra/serviceInstances/v4/<service_instance_id>/networks
+mso.restapi.vf.module.instance=/ecomp/mso/infra/serviceInstances/v4/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules
+mso.restapi.volume.group.instance=/ecomp/mso/infra/serviceInstances/v4/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups
+mso.restapi.get.orc.req=/ecomp/mso/infra/orchestrationRequests/v4
+mso.restapi.get.orc.reqs=/ecomp/mso/infra/orchestrationRequests/v4?
 mso.restapi.get.man.tasks=/tasks/v1
 vid.truststore.filename=/opt/app/vid/etc/vid_keystore.jks
 mso.dme2.client.timeout=30000