1. Fix Formatter bug
2. Add unit test.