Fixes for SMS tests