Added formatter tests, and made formatting ISO 6709 compliant