Followup refactoring supporting format changes.

Changes include paths in main file.

Updates tests that used formatting classes directly.

Adds delimiter default value, empty string.

Adds supporting method to change class.