MOBSDK-646, MOBSDK-704, unit test fixes