Fixes
Merge branch 'integration-v2.0' into public_repo_fixes
MMS and SMS fixes
A bunch of tests modified
Non breaking file
Fixed unexpected indent
Deleted
Merge pull request #488 from owdqa/public_repo_fixes

Public repo fixes