All formatting tests pass. Now just the two oddities.