fix remaining tests

Author: fadidurah

common

@@ -38,7 +38,6 @@
 import com.microsoft.identity.labapi.utilities.authentication.LabApiAuthenticationClient;
 import com.microsoft.identity.labapi.utilities.client.ILabAccount;
 import com.microsoft.identity.labapi.utilities.client.LabClient;
-import com.microsoft.identity.labapi.utilities.client.LabGuestAccount;
 import com.microsoft.identity.labapi.utilities.constants.TempUserType;
 import com.microsoft.identity.labapi.utilities.exception.LabApiException;
 

msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/AbstractGuestAccountMsalUiTest.java

@@ -34,6 +34,7 @@ import com.microsoft.identity.client.ui.automation.installer.LocalApkInstaller
 import com.microsoft.identity.client.ui.automation.interaction.FirstPartyAppPromptHandlerParameters
 import com.microsoft.identity.client.ui.automation.interaction.PromptParameter
 import com.microsoft.identity.client.ui.automation.logging.Logger
+import com.microsoft.identity.common.java.util.ThreadUtils
 import com.microsoft.identity.labapi.utilities.client.ILabAccount
 import com.microsoft.identity.labapi.utilities.constants.TempUserType
 import com.microsoft.identity.labapi.utilities.constants.UserType
@@ -80,6 +81,8 @@ class TestCase2798415 : AbstractMsalBrokerTest() {
         teams.addFirstAccount(username, password, teamsPromptHandlerParameters)
         // handle app protection policy in CP i.e. setup PIN when asked
         (companyPortal as IMdmAgent).handleAppProtectionPolicy()
+        ThreadUtils.sleepSafely(10000, "sleeping", "interrupted sleep")
+
         teams.forceStop() // Teams sometimes seems to like to pop up on screen randomly
 
         teams.signOutSharedDeviceMode()

msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mam/TestCase2798415.kt

@@ -122,6 +122,6 @@ public String getAuthority() {
 
     @Override
     public int getConfigFileResourceId() {
-        return R.raw.msal_config_instance_aware_common;
+        return R.raw.msal_config_msidlab4_instance_aware;
     }
 }