Formatting helper and unit tests added