Moved some tests from sms to make them all pass.