Fix failed unittests.
Merge remote-tracking branch 'origin/develop' into fix_tests
Merge pull request #1031 from ismailsunni/fix_tests

Fix tests