Fix SMS and other tests for v2.1
Changes from comments in pull request #532
Merge pull request #532 from owdqa/bug/fix_sms_v2.1

Fix SMS and other tests for v2.1