Fixing tests that fail on MP.dev (Desktop & Mobile)
Merge pull request #386 from AndreiH/fix_mp_dev

Fixing tests that fail on MP.dev (Desktop & Mobile)