In custom_mocks_test, there were only a handful that were sensitive to formatting, so I just loosened the tests a bit manually.#779