Fixing up format tests.