Fixes for public SMS tests