Minor brush up of StringUtils - using real enums and added missing {} test