Bug 840497 - [SMS] Fix & restore Unit Tests r=julienw