Format more code under ./tests
Merge branch 'pr/format-code' into trying/hey

* pr/format-code:
  Format more code under ./tests