Adjustments for new Format newtype.
Updated tests for new Format.