Rename "Formatters" --> "Formatter".

Also fix breaking test due to character-encoding problems.