Remove a redundant test; a tiny bit of cleanup.
Misc reformatting.
Make pre-commit work if you have deleted files.

Clean up test output.