Re-organizes safe-tags tests
Preserves single and double quotes in translations