Changes related to SMS and bug fixes in testing