MOBSDK-726

Unit test follow-up fixes