Fix the build, hopefully
Properly fix broken test AND reformat everything.

Make @LordAro happy, possibly.  (ha.  as if :p)