Added UnitFormatter and tests