string literal fix-to-the-fix and tests