Some cleanups

Something like testGivenInvalidFormattingOption_formatThrowsException