-import org.openecomp.portalapp.portal.domain.EPApp;
-import org.openecomp.portalapp.portal.framework.MockitoTestSuite;
-import org.openecomp.portalapp.service.RemoteWebServiceCallServiceImpl;
-import org.openecomp.portalsdk.core.onboarding.util.CipherUtil;
-import org.openecomp.portalsdk.core.service.DataAccessService;
-import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.onap.portalapp.portal.domain.EPApp;
+import org.onap.portalapp.portal.framework.MockitoTestSuite;
+import org.onap.portalapp.portal.service.AppsCacheService;
+import org.onap.portalapp.portal.utils.EcompPortalUtils;
+import org.onap.portalapp.service.RemoteWebServiceCallServiceImpl;
+import org.onap.portalsdk.core.onboarding.util.CipherUtil;
+import org.onap.portalsdk.core.service.DataAccessService;