Fixing more SMS tests