Fixes for SMS tests in v2.0