Merge pull request #290 from mikeh/master

MOBSDK-726
MOBSDK-726: Unit test follow-up fixes