Format code.
Fix broken test again.