Run scalafmt and scalafix on src/main and src/test
Created by: cache-nez
Fixing leftover style inconsistencies in this PR so that they don't pop up in an unrelated change.
Created by: cache-nez
Fixing leftover style inconsistencies in this PR so that they don't pop up in an unrelated change.