Merge pull request #8158 from borjasalguero/restore_unit_test_sms

Bug 840497 - [SMS] Fix & restore Unit Tests r=julienw(cherry picked from commit bf98de3a646e140952849da0f0c411cbd3d7c50e)