Backport changes done in the ffos-sms-test
Merge pull request #3 from comoyo/refactor

Backport changes done in the ffos-sms-test