MOBSDK-639. Unit Test fixes.