Format more code.
Try to fix broken test.