Improve current SMS tests, and fix with bug 952875 workaround