The last of the .format strings
Change tests so they show failures better.
Update a test for new quoting